Merge remote-tracking branch 'origin/develop' into log-management

signal18 · Jun 6, 2024 · 9621294 · 9621294
2 parents 7baa171 + c9d5ed3
commit 9621294
Show file tree

Hide file tree

Showing 5 changed files with 1,620 additions and 1,606 deletions.
diff --git a/clients/client_topology.go b/clients/client_topology.go
@@ -40,7 +40,7 @@ func cliGetTopology() {
 		headstr += " |  Mode: Manual "
 	}
 
-	headstr += fmt.Sprintf("\n%19s %15s %6s %15s %10s %12s %20s %20s %30s %6s %3s", "Id", "Host", "Port", "Status", "Failures", "Using GTID", "Current GTID", "Slave GTID", "Replication Health", "Delay", "RO")
+	headstr += fmt.Sprintf("\n%19s %15s %6s %15s %10s %12s %20s %20s %30s %6s %3s %5s", "Id", "Host", "Port", "Status", "Failures", "Using GTID", "Current GTID", "Slave GTID", "Replication Health", "Delay", "RO", "MAINT")
 
 	for _, server := range cliServers {
 		var gtidCurr string
@@ -56,9 +56,16 @@ func cliGetTopology() {
 			gtidSlave = ""
 		}
 
-		headstr += fmt.Sprintf("\n%19s %15s %6s %15s %10d %12s %20s %20s %30s %6d %3s", server.Id, server.Host, server.Port, server.State, server.FailCount, server.GetReplicationUsingGtid(), gtidCurr, gtidSlave, "", server.GetReplicationDelay(), server.ReadOnly)
+		headstr += fmt.Sprintf("\n%19s %15s %6s %15s %10d %12s %20s %20s %30s %6d %3s %5s", server.Id, server.Host, server.Port, server.State, server.FailCount, server.GetReplicationUsingGtid(), gtidCurr, gtidSlave, "", server.GetReplicationDelay(), server.ReadOnly, boolToChar(server.IsMaintenance))
 
 	}
 	fmt.Printf(headstr)
 	fmt.Printf("\n")
 }
+
+func boolToChar(v bool) string {
+	if v {
+		return "Y"
+	}
+	return "N"
+}
diff --git a/server/server.go b/server/server.go
@@ -101,12 +101,12 @@ type ReplicationManager struct {
 	exit                                             bool
 	isStarted                                        bool
 	Confs                                            map[string]config.Config
-	VersionConfs                                     map[string]*config.ConfVersion
-	grpcServer                                       *grpc.Server               `json:"-"`
-	grpcWrapped                                      *grpcweb.WrappedGrpcServer `json:"-"`
-	V3Up                                             chan bool                  `json:"-"`
-	v3Config                                         Repmanv3Config             `json:"-"`
-	cloud18CheckSum                                  hash.Hash                  `json:"-"`
+	VersionConfs                                     map[string]*config.ConfVersion `json:"-"`
+	grpcServer                                       *grpc.Server                   `json:"-"`
+	grpcWrapped                                      *grpcweb.WrappedGrpcServer     `json:"-"`
+	V3Up                                             chan bool                      `json:"-"`
+	v3Config                                         Repmanv3Config                 `json:"-"`
+	cloud18CheckSum                                  hash.Hash                      `json:"-"`
 	repmanv3.UnimplementedClusterPublicServiceServer `json:"-"`
 	repmanv3.UnimplementedClusterServiceServer       `json:"-"`
 	sync.Mutex

diff --git a/share/dashboard/app/dashboard.html b/share/dashboard/app/dashboard.html
@@ -92,7 +92,7 @@
     </div>
     <footer class="footer">
         <div >
-            <span align="right" class="text-muted">Replication-Manager {{settings.fullVersion}} © 2017-2021 SIGNAL18 CLOUD SAS</span>
+            <span align="right" class="text-muted">Replication-Manager {{settings.fullVersion}} © 2017-{{yearNow}} SIGNAL18 CLOUD SAS</span>
         </div>
     </footer>
 </div>