|
|
@@ -187,8 +187,8 @@ func (p *program) upgradeService(service serviceUpgradeConfig) (string, string,
|
|
|
return currentVersion, info.Version, false, nil
|
|
|
}
|
|
|
|
|
|
- baseapp.Logger.Infof("[%s] yfkj-%s.service 发现新版本: %s -> %s, 开始升级",
|
|
|
- p.name, service.Name, currentVersion, info.Version)
|
|
|
+ baseapp.Logger.Infof("[%s] yfkj-%s.service 发现新版本: %s, 开始升级...",
|
|
|
+ p.name, service.Name, info.Version)
|
|
|
|
|
|
currentDir, err := getCurrentVersionDir(service.InstallPath, service.Name)
|
|
|
if err != nil {
|
|
|
@@ -298,14 +298,14 @@ func nextVersionDir(currentDir string) string {
|
|
|
func installPackage(pkg string, targetDir string, service serviceUpgradeConfig) error {
|
|
|
tempDir, err := os.MkdirTemp(service.InstallPath, ".upgrade-")
|
|
|
if err != nil {
|
|
|
- return fmt.Errorf("创建临时目录未成功: %w", err)
|
|
|
+ return fmt.Errorf("创建临时目录失败: %w", err)
|
|
|
}
|
|
|
defer os.RemoveAll(tempDir)
|
|
|
|
|
|
cmd := exec.Command("tar", "-xzf", pkg, "-C", tempDir)
|
|
|
output, err := cmd.CombinedOutput()
|
|
|
if err != nil {
|
|
|
- return fmt.Errorf("解压%s升级包未成功: %w: %s", service.Name, err, strings.TrimSpace(string(output)))
|
|
|
+ return fmt.Errorf("解压%s升级包时出错: %w: %s", service.Name, err, strings.TrimSpace(string(output)))
|
|
|
}
|
|
|
|
|
|
program := filepath.Join(tempDir, service.Name)
|
|
|
@@ -414,7 +414,7 @@ func switchServiceVersion(serviceName string, installPath string, targetName str
|
|
|
}
|
|
|
|
|
|
if err := exec.Command("systemctl", "start", service).Run(); err != nil {
|
|
|
- startErr := fmt.Errorf("新版本启动未成功: %w", err)
|
|
|
+ startErr := fmt.Errorf("新版本启动失败: %w", err)
|
|
|
|
|
|
if err := os.Symlink(currentTarget, tempLink); err != nil {
|
|
|
return errors.Join(startErr, fmt.Errorf("创建回滚链接失败: %w", err))
|