Skip to content

Commit 0907070

Browse files
committed
Merge branch 'release-4.2502.x' of https://github.com/actiontech/sqle into release-4.2502.x
2 parents a17faa1 + 08712eb commit 0907070

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

sqle/driver/plugin_manager.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ func (pm *pluginManager) Start(pluginDir string, pluginConfigList []config.Plugi
192192
log.NewEntry().Warnf("stop residual plugin file path walk error: %v", err)
193193
}
194194
wg.Wait()
195+
jdkPath := getJdkPath()
195196

196197
// register plugin
197198
for _, p := range plugins {
@@ -205,9 +206,8 @@ func (pm *pluginManager) Start(pluginDir string, pluginConfigList []config.Plugi
205206
break
206207
}
207208
}
208-
209209
if len(cmdArgs) == 0 && strings.HasSuffix(p.Name(), ".jar") {
210-
javaPluginCmd := fmt.Sprintf("$SQLE_JAVA_HOME/bin/java -jar %s", cmdBase)
210+
javaPluginCmd := fmt.Sprintf("%s/bin/java -jar %s", jdkPath, cmdBase)
211211
cmdBase = "sh"
212212
cmdArgs = append(cmdArgs, "-c", javaPluginCmd)
213213
}
@@ -242,6 +242,16 @@ func (pm *pluginManager) Start(pluginDir string, pluginConfigList []config.Plugi
242242
return nil
243243
}
244244

245+
func getJdkPath() string {
246+
nowDir, err := os.Getwd()
247+
if err != nil {
248+
log.NewEntry().Errorf("failed to get directory: %v", err)
249+
return ""
250+
}
251+
jdkPath := filepath.Join(nowDir, "jdk")
252+
return jdkPath
253+
}
254+
245255
func (pm *pluginManager) Stop() {
246256
for name, pp := range pm.pluginProcessors {
247257
err := pp.Stop()

0 commit comments

Comments
 (0)