mirror of
https://github.com/photoprism/photoprism.git
synced 2025-12-12 00:34:13 +01:00
Cluster: Change conf.AppName() to Name() in node register request #98
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
@@ -221,7 +221,7 @@ Frequently Touched Files (by topic)
|
||||
- Workers: `internal/workers/*`
|
||||
- Cluster: `internal/service/cluster/*`
|
||||
- Theme support: `internal/service/cluster/theme/version.go` exposes `DetectVersion`, used by bootstrap, CLI, and API handlers to compare portal vs node theme revisions (prefers `fs.VersionTxtFile`, falls back to `app.js` mtime).
|
||||
- Registration sanitizes `AppName`, `AppVersion`, and `Theme` with `clean.TypeUnicode`; `cluster.RegisterResponse` now includes a `Theme` hint when the portal has a newer bundle so nodes can decide whether to download immediately.
|
||||
- Registration sanitizes `AppName`, `AppVersion`, and `Theme` with `clean.TypeUnicode`; defaults for app metadata come from `config.Name()` / `config.Version()`. `cluster.RegisterResponse` now includes a `Theme` hint when the portal has a newer bundle so nodes can decide whether to download immediately.
|
||||
- Headers: `pkg/service/http/header/*`
|
||||
|
||||
Downloads (CLI) & yt-dlp helpers
|
||||
|
||||
@@ -137,7 +137,7 @@ func clusterNodesRotateAction(ctx *cli.Context) error {
|
||||
NodeName: name,
|
||||
RotateDatabase: rotateDatabase,
|
||||
RotateSecret: rotateSecret,
|
||||
AppName: clean.TypeUnicode(conf.AppName()),
|
||||
AppName: clean.TypeUnicode(conf.Name()),
|
||||
AppVersion: clean.TypeUnicode(conf.Version()),
|
||||
}
|
||||
if themeVersion, err := theme.DetectVersion(conf.ThemePath()); err == nil && themeVersion != "" {
|
||||
|
||||
@@ -117,7 +117,7 @@ func clusterRegisterAction(ctx *cli.Context) error {
|
||||
overrideAppName := clean.TypeUnicode(ctx.String("app-name"))
|
||||
overrideAppVersion := clean.TypeUnicode(ctx.String("app-version"))
|
||||
|
||||
defaultAppName := clean.TypeUnicode(conf.AppName())
|
||||
defaultAppName := clean.TypeUnicode(conf.Name())
|
||||
defaultAppVersion := clean.TypeUnicode(conf.Version())
|
||||
|
||||
if overrideAppName == "" {
|
||||
|
||||
@@ -141,7 +141,7 @@ func registerWithPortal(c *config.Config, portal *url.URL, token string) error {
|
||||
NodeUUID: c.NodeUUID(),
|
||||
NodeRole: c.NodeRole(),
|
||||
AdvertiseUrl: c.AdvertiseUrl(),
|
||||
AppName: clean.TypeUnicode(c.AppName()),
|
||||
AppName: clean.TypeUnicode(c.Name()),
|
||||
AppVersion: clean.TypeUnicode(c.Version()),
|
||||
}
|
||||
|
||||
|
||||
@@ -88,7 +88,7 @@ func TestRegister_PersistSecretAndDB(t *testing.T) {
|
||||
c.Options().JoinToken = cluster.ExampleJoinToken
|
||||
c.Options().SiteUrl = expectedSite
|
||||
c.Options().AdvertiseUrl = expectedSite
|
||||
expectedAppName = c.AppName()
|
||||
expectedAppName = c.Name()
|
||||
expectedAppVersion = c.Version()
|
||||
// Gate rotate=true: driver mysql and no DSN/fields.
|
||||
c.Options().DatabaseDriver = config.MySQL
|
||||
|
||||
Reference in New Issue
Block a user