mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-10-12 18:26:36 +08:00
打印日志
This commit is contained in:
+1
-1
@@ -68,7 +68,7 @@ REDIS_KEY_PREFIX=wavelet:
|
|||||||
|
|
||||||
# ─── 日志 ──────────────────────────────────────────────────────────────────────
|
# ─── 日志 ──────────────────────────────────────────────────────────────────────
|
||||||
LOG_LEVEL=info
|
LOG_LEVEL=info
|
||||||
LOG_FORMAT=json
|
LOG_FORMAT=console
|
||||||
LOG_OUTPUT=stdout
|
LOG_OUTPUT=stdout
|
||||||
|
|
||||||
# ─── OpenTelemetry ─────────────────────────────────────────────────────────────
|
# ─── OpenTelemetry ─────────────────────────────────────────────────────────────
|
||||||
|
|||||||
+1
-1
@@ -85,7 +85,7 @@ redis:
|
|||||||
# ─── Logging ────────────────────────────────────────────────────────────────────
|
# ─── Logging ────────────────────────────────────────────────────────────────────
|
||||||
log:
|
log:
|
||||||
level: "info" # debug | info | warn | error | fatal | panic
|
level: "info" # debug | info | warn | error | fatal | panic
|
||||||
format: "json" # text | json
|
format: "console" # console | json
|
||||||
output: "stdout" # stdout | file
|
output: "stdout" # stdout | file
|
||||||
file_path: "./logs/app.log"
|
file_path: "./logs/app.log"
|
||||||
max_size: 100 # MB per log file
|
max_size: 100 # MB per log file
|
||||||
|
|||||||
+2
-1
@@ -1,9 +1,10 @@
|
|||||||
services:
|
services:
|
||||||
|
|
||||||
wavelet:
|
wavelet:
|
||||||
# build:
|
# build:
|
||||||
# context: .
|
# context: .
|
||||||
# dockerfile: docker/Dockerfile
|
# dockerfile: docker/Dockerfile
|
||||||
|
# args:
|
||||||
|
# VERSION: v0.9.9
|
||||||
image: ghcr.io/rain-kl/wavelet:latest
|
image: ghcr.io/rain-kl/wavelet:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
env_file: .env
|
env_file: .env
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/Rain-kl/Wavelet/internal/buildinfo"
|
"github.com/Rain-kl/Wavelet/internal/buildinfo"
|
||||||
|
"github.com/Rain-kl/Wavelet/internal/logger"
|
||||||
"github.com/Rain-kl/Wavelet/internal/model"
|
"github.com/Rain-kl/Wavelet/internal/model"
|
||||||
"golang.org/x/mod/semver"
|
"golang.org/x/mod/semver"
|
||||||
)
|
)
|
||||||
@@ -192,7 +193,13 @@ func (m *manager) fetchRelease(ctx context.Context, repository string) (githubRe
|
|||||||
if err := decoder.Decode(&releases); err != nil {
|
if err := decoder.Decode(&releases); err != nil {
|
||||||
return githubRelease{}, releaseAsset{}, fmt.Errorf("%s: %w", errReleaseResponseInvalid, err)
|
return githubRelease{}, releaseAsset{}, fmt.Errorf("%s: %w", errReleaseResponseInvalid, err)
|
||||||
}
|
}
|
||||||
return selectLatestRelease(releases)
|
|
||||||
|
release, asset, err := selectLatestRelease(releases)
|
||||||
|
if err != nil {
|
||||||
|
return githubRelease{}, releaseAsset{}, err
|
||||||
|
}
|
||||||
|
logger.InfoF(ctx, "[Updater] Selected latest compatible release: %s (Asset: %s)", release.TagName, asset.Name)
|
||||||
|
return release, asset, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadRepository(ctx context.Context) (string, error) {
|
func loadRepository(ctx context.Context) (string, error) {
|
||||||
@@ -217,6 +224,8 @@ func (m *manager) status(ctx context.Context) (Status, releaseAsset, error) {
|
|||||||
latestVersion := normalizeVersion(release.TagName)
|
latestVersion := normalizeVersion(release.TagName)
|
||||||
updateAvailable := currentVersion != "" && semver.Compare(latestVersion, currentVersion) > 0
|
updateAvailable := currentVersion != "" && semver.Compare(latestVersion, currentVersion) > 0
|
||||||
|
|
||||||
|
logger.InfoF(ctx, "[Updater] Check update complete. current: %s, latest: %s, update_available: %t", buildinfo.Version, release.TagName, updateAvailable)
|
||||||
|
|
||||||
return Status{
|
return Status{
|
||||||
CurrentVersion: buildinfo.Version,
|
CurrentVersion: buildinfo.Version,
|
||||||
BuildTime: buildinfo.BuildTime,
|
BuildTime: buildinfo.BuildTime,
|
||||||
@@ -238,6 +247,7 @@ func downloadArchive(ctx context.Context, client releaseClient, asset releaseAss
|
|||||||
if asset.Size <= 0 || asset.Size > maxArchiveSize {
|
if asset.Size <= 0 || asset.Size > maxArchiveSize {
|
||||||
return fmt.Errorf("release 资产大小无效: %d", asset.Size)
|
return fmt.Errorf("release 资产大小无效: %d", asset.Size)
|
||||||
}
|
}
|
||||||
|
logger.InfoF(ctx, "[Updater] Downloading release asset: %s", asset.Name)
|
||||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, asset.BrowserDownloadURL, nil)
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, asset.BrowserDownloadURL, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("创建升级下载请求失败: %w", err)
|
return fmt.Errorf("创建升级下载请求失败: %w", err)
|
||||||
@@ -272,6 +282,7 @@ func downloadArchive(ctx context.Context, client releaseClient, asset releaseAss
|
|||||||
if written > maxArchiveSize || written != asset.Size {
|
if written > maxArchiveSize || written != asset.Size {
|
||||||
return fmt.Errorf("升级归档大小不匹配: got %d, want %d", written, asset.Size)
|
return fmt.Errorf("升级归档大小不匹配: got %d, want %d", written, asset.Size)
|
||||||
}
|
}
|
||||||
|
logger.InfoF(ctx, "[Updater] Successfully downloaded release asset to %s", destination)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -288,7 +299,8 @@ func safeArchivePath(destination, name string) (string, error) {
|
|||||||
return target, nil
|
return target, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func extractTarGz(archivePath, destination, binaryName string) (string, error) {
|
func extractTarGz(ctx context.Context, archivePath, destination, binaryName string) (string, error) {
|
||||||
|
logger.InfoF(ctx, "[Updater] Extracting tar.gz archive: %s", archivePath)
|
||||||
file, err := os.Open(archivePath) //nolint:gosec // archivePath is created by prepareUpgrade in the executable directory.
|
file, err := os.Open(archivePath) //nolint:gosec // archivePath is created by prepareUpgrade in the executable directory.
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
@@ -337,12 +349,14 @@ func extractTarGz(archivePath, destination, binaryName string) (string, error) {
|
|||||||
if written > maxArchiveSize {
|
if written > maxArchiveSize {
|
||||||
return "", errors.New("解压后的程序文件超过大小限制")
|
return "", errors.New("解压后的程序文件超过大小限制")
|
||||||
}
|
}
|
||||||
|
logger.InfoF(ctx, "[Updater] Successfully extracted binary to %s", target)
|
||||||
return target, nil
|
return target, nil
|
||||||
}
|
}
|
||||||
return "", errors.New(errNoCompatibleAsset)
|
return "", errors.New(errNoCompatibleAsset)
|
||||||
}
|
}
|
||||||
|
|
||||||
func extractZip(archivePath, destination, binaryName string) (string, error) {
|
func extractZip(ctx context.Context, archivePath, destination, binaryName string) (string, error) {
|
||||||
|
logger.InfoF(ctx, "[Updater] Extracting zip archive: %s", archivePath)
|
||||||
reader, err := zip.OpenReader(archivePath)
|
reader, err := zip.OpenReader(archivePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
@@ -365,7 +379,6 @@ func extractZip(archivePath, destination, binaryName string) (string, error) {
|
|||||||
}
|
}
|
||||||
output, err := os.OpenFile(target, os.O_CREATE|os.O_EXCL|os.O_WRONLY, stagedBinaryMode) //nolint:gosec // target is constrained by safeArchivePath.
|
output, err := os.OpenFile(target, os.O_CREATE|os.O_EXCL|os.O_WRONLY, stagedBinaryMode) //nolint:gosec // target is constrained by safeArchivePath.
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// The output was not opened, so there is no useful recovery action for a read-only close failure.
|
|
||||||
_ = input.Close()
|
_ = input.Close()
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
@@ -384,6 +397,7 @@ func extractZip(archivePath, destination, binaryName string) (string, error) {
|
|||||||
if written > maxArchiveSize {
|
if written > maxArchiveSize {
|
||||||
return "", errors.New("解压后的程序文件超过大小限制")
|
return "", errors.New("解压后的程序文件超过大小限制")
|
||||||
}
|
}
|
||||||
|
logger.InfoF(ctx, "[Updater] Successfully extracted binary to %s", target)
|
||||||
return target, nil
|
return target, nil
|
||||||
}
|
}
|
||||||
return "", errors.New(errNoCompatibleAsset)
|
return "", errors.New(errNoCompatibleAsset)
|
||||||
@@ -411,6 +425,8 @@ func (m *manager) prepareUpgrade(ctx context.Context) (string, string, error) {
|
|||||||
return "", "", errors.New(errAlreadyUpToDate)
|
return "", "", errors.New(errAlreadyUpToDate)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.InfoF(ctx, "[Updater] Preparing upgrade. current: %s, latest: %s", status.CurrentVersion, status.LatestVersion)
|
||||||
|
|
||||||
executable, err := os.Executable()
|
executable, err := os.Executable()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", "", fmt.Errorf("定位当前程序失败: %w", err)
|
return "", "", fmt.Errorf("定位当前程序失败: %w", err)
|
||||||
@@ -419,6 +435,7 @@ func (m *manager) prepareUpgrade(ctx context.Context) (string, string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "", "", fmt.Errorf("解析当前程序路径失败: %w", err)
|
return "", "", fmt.Errorf("解析当前程序路径失败: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
tempDir, err := os.MkdirTemp(filepath.Dir(executable), ".wavelet-update-*")
|
tempDir, err := os.MkdirTemp(filepath.Dir(executable), ".wavelet-update-*")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", "", fmt.Errorf("创建升级目录失败: %w", err)
|
return "", "", fmt.Errorf("创建升级目录失败: %w", err)
|
||||||
@@ -434,15 +451,18 @@ func (m *manager) prepareUpgrade(ctx context.Context) (string, string, error) {
|
|||||||
if runtime.GOOS == windowsOS {
|
if runtime.GOOS == windowsOS {
|
||||||
binaryName += ".exe"
|
binaryName += ".exe"
|
||||||
}
|
}
|
||||||
stagedBinary, err := extractTarGz(archivePath, tempDir, binaryName)
|
var stagedBinary string
|
||||||
if strings.HasSuffix(asset.Name, ".zip") {
|
if strings.HasSuffix(asset.Name, ".zip") {
|
||||||
stagedBinary, err = extractZip(archivePath, tempDir, binaryName)
|
stagedBinary, err = extractZip(ctx, archivePath, tempDir, binaryName)
|
||||||
|
} else {
|
||||||
|
stagedBinary, err = extractTarGz(ctx, archivePath, tempDir, binaryName)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Cleanup is best effort because the extraction error is the actionable failure.
|
// Cleanup is best effort because the extraction error is the actionable failure.
|
||||||
_ = os.RemoveAll(tempDir)
|
_ = os.RemoveAll(tempDir)
|
||||||
return "", "", fmt.Errorf("解压升级资产失败: %w", err)
|
return "", "", fmt.Errorf("解压升级资产失败: %w", err)
|
||||||
}
|
}
|
||||||
|
logger.InfoF(ctx, "[Updater] Staged binary successfully prepared: %s", stagedBinary)
|
||||||
m.upgrading = true
|
m.upgrading = true
|
||||||
return executable, stagedBinary, nil
|
return executable, stagedBinary, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,32 +6,45 @@
|
|||||||
package updater
|
package updater
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
|
"github.com/Rain-kl/Wavelet/internal/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
const installedBinaryMode = 0o755
|
const installedBinaryMode = 0o755
|
||||||
|
|
||||||
func replaceAndRestart(executable, stagedBinary string) error {
|
func replaceAndRestart(executable, stagedBinary string) error {
|
||||||
|
ctx := context.Background()
|
||||||
|
logger.InfoF(ctx, "[Updater] Swapping executable: %s -> %s", executable, stagedBinary)
|
||||||
backup := executable + ".old"
|
backup := executable + ".old"
|
||||||
|
|
||||||
if err := os.Remove(backup); err != nil && !os.IsNotExist(err) {
|
if err := os.Remove(backup); err != nil && !os.IsNotExist(err) {
|
||||||
return fmt.Errorf("删除旧备份失败: %w", err)
|
return fmt.Errorf("删除旧备份失败: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := os.Rename(executable, backup); err != nil {
|
if err := os.Rename(executable, backup); err != nil {
|
||||||
return fmt.Errorf("备份当前程序失败: %w", err)
|
return fmt.Errorf("备份当前程序失败: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := os.Rename(stagedBinary, executable); err != nil {
|
if err := os.Rename(stagedBinary, executable); err != nil {
|
||||||
_ = os.Rename(backup, executable)
|
_ = os.Rename(backup, executable)
|
||||||
return fmt.Errorf("替换当前程序失败: %w", err)
|
return fmt.Errorf("替换当前程序失败: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := os.Chmod(executable, installedBinaryMode); err != nil { //nolint:gosec // the installed application binary must be executable.
|
if err := os.Chmod(executable, installedBinaryMode); err != nil { //nolint:gosec // the installed application binary must be executable.
|
||||||
_ = os.Remove(executable)
|
_ = os.Remove(executable)
|
||||||
_ = os.Rename(backup, executable)
|
_ = os.Rename(backup, executable)
|
||||||
return fmt.Errorf("设置程序执行权限失败: %w", err)
|
return fmt.Errorf("设置程序执行权限失败: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stagingDir := filepath.Dir(stagedBinary)
|
||||||
// Cleanup is best effort; a leftover staging directory must not block restart.
|
// Cleanup is best effort; a leftover staging directory must not block restart.
|
||||||
_ = os.RemoveAll(filepath.Dir(stagedBinary))
|
_ = os.RemoveAll(stagingDir)
|
||||||
|
|
||||||
|
logger.InfoF(ctx, "[Updater] Executing syscall.Exec to restart service: %s %v", executable, os.Args)
|
||||||
return syscall.Exec(executable, os.Args, os.Environ()) //nolint:gosec // executable is resolved from os.Executable and never supplied by a request.
|
return syscall.Exec(executable, os.Args, os.Environ()) //nolint:gosec // executable is resolved from os.Executable and never supplied by a request.
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user