diff --git a/build/sqled.spec b/build/sqled.spec index 367d24dac4..c0db0073b2 100644 --- a/build/sqled.spec +++ b/build/sqled.spec @@ -93,7 +93,6 @@ if [ $? -eq 0 ]; then -e "s|User=|User=actiontech-universe|g" \ -e "s|ExecStart=|ExecStart=/bin/sh -c 'exec $RPM_INSTALL_PREFIX\/bin\/sqled --config $RPM_INSTALL_PREFIX\/etc\/sqled.yml --pidfile=$RPM_INSTALL_PREFIX\/sqled.pid >>$RPM_INSTALL_PREFIX\/std.log 2>\&1'|g" \ -e "s|WorkingDirectory=|WorkingDirectory=$RPM_INSTALL_PREFIX|g" \ - -e "s|Environment=|Environment=SQLE_JAVA_HOME=$RPM_INSTALL_PREFIX\/jdk|g" \ $RPM_INSTALL_PREFIX/scripts/sqled.systemd > /lib/systemd/system/sqled.service systemctl daemon-reload systemctl enable sqled.service diff --git a/build/sqled_with_dms.spec b/build/sqled_with_dms.spec index 37aa876bd2..4e079e9d14 100644 --- a/build/sqled_with_dms.spec +++ b/build/sqled_with_dms.spec @@ -101,7 +101,6 @@ if [ $? -eq 0 ]; then -e "s|User=|User=actiontech-universe|g" \ -e "s|ExecStart=|ExecStart=/bin/sh -c 'exec $RPM_INSTALL_PREFIX\/bin\/sqled --config $RPM_INSTALL_PREFIX\/etc\/config.yaml --pidfile=$RPM_INSTALL_PREFIX\/sqled.pid >>$RPM_INSTALL_PREFIX\/std.log 2>\&1'|g" \ -e "s|WorkingDirectory=|WorkingDirectory=$RPM_INSTALL_PREFIX|g" \ - -e "s|Environment=|Environment=SQLE_JAVA_HOME=$RPM_INSTALL_PREFIX\/jdk|g" \ $RPM_INSTALL_PREFIX/scripts/sqled.systemd > /lib/systemd/system/sqled.service sed -e "s|PIDFile=|PIDFile=$RPM_INSTALL_PREFIX\/dms.pid|g" \ -e "s|User=|User=actiontech-universe|g" \ diff --git a/sqle/driver/plugin_manager.go b/sqle/driver/plugin_manager.go index 5c2f93eab1..c238e4fe32 100644 --- a/sqle/driver/plugin_manager.go +++ b/sqle/driver/plugin_manager.go @@ -192,6 +192,7 @@ func (pm *pluginManager) Start(pluginDir string, pluginConfigList []config.Plugi log.NewEntry().Warnf("stop residual plugin file path walk error: %v", err) } wg.Wait() + jdkPath := getJdkPath() // register plugin for _, p := range plugins { @@ -205,9 +206,8 @@ func (pm *pluginManager) Start(pluginDir string, pluginConfigList []config.Plugi break } } - if len(cmdArgs) == 0 && strings.HasSuffix(p.Name(), ".jar") { - javaPluginCmd := fmt.Sprintf("$SQLE_JAVA_HOME/bin/java -jar %s", cmdBase) + javaPluginCmd := fmt.Sprintf("%s/bin/java -jar %s", jdkPath, cmdBase) cmdBase = "sh" cmdArgs = append(cmdArgs, "-c", javaPluginCmd) } @@ -242,6 +242,16 @@ func (pm *pluginManager) Start(pluginDir string, pluginConfigList []config.Plugi return nil } +func getJdkPath() string { + nowDir, err := os.Getwd() + if err != nil { + log.NewEntry().Errorf("failed to get directory: %v", err) + return "" + } + jdkPath := filepath.Join(nowDir, "jdk") + return jdkPath +} + func (pm *pluginManager) Stop() { for name, pp := range pm.pluginProcessors { err := pp.Stop()