Cluster: Report Config.About() instead of Config.Name() as app name #98

Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2025-10-19 14:30:10 +02:00
parent 695b33f097
commit e6959e7e96
5 changed files with 11 additions and 4 deletions

View File

@@ -137,12 +137,14 @@ func clusterNodesRotateAction(ctx *cli.Context) error {
NodeName: name,
RotateDatabase: rotateDatabase,
RotateSecret: rotateSecret,
AppName: clean.TypeUnicode(conf.Name()),
AppName: clean.TypeUnicode(conf.About()),
AppVersion: clean.TypeUnicode(conf.Version()),
}
if themeVersion, err := theme.DetectVersion(conf.ThemePath()); err == nil && themeVersion != "" {
payload.Theme = themeVersion
}
b, _ := json.Marshal(payload)
endpointUrl := stringsTrimRightSlash(portalURL) + "/api/v1/cluster/nodes/register"

View File

@@ -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.Name())
defaultAppName := clean.TypeUnicode(conf.About())
defaultAppVersion := clean.TypeUnicode(conf.Version())
if overrideAppName == "" {

View File

@@ -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.Name()),
AppName: clean.TypeUnicode(c.About()),
AppVersion: clean.TypeUnicode(c.Version()),
}

View File

@@ -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.Name()
expectedAppName = c.About()
expectedAppVersion = c.Version()
// Gate rotate=true: driver mysql and no DSN/fields.
c.Options().DatabaseDriver = config.MySQL

View File

@@ -81,6 +81,11 @@ func TestTypeUnicode(t *testing.T) {
input: "äöü",
want: "äöü",
},
{
name: "About",
input: "PhotoPrism® Pro",
want: "PhotoPrism® Pro",
},
{
name: "Empty",
input: "",