Added support for sqlite in db backend reporting in /web/status.

openark · Jun 26, 2017 · 93a5cf4 · 93a5cf4
1 parent 488d834
commit 93a5cf4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/go/db/db.go b/go/db/db.go
@@ -1249,8 +1249,7 @@ var generateSQLPatches = []string{
 	`,
 	`
 		ALTER TABLE node_health
-			ADD COLUMN mysql_backend_hostname varchar(128) CHARACTER SET ascii,
-			ADD COLUMN mysql_backend_port smallint UNSIGNED
+			ADD COLUMN db_backend varchar(255) CHARACTER SET ascii NOT NULL DEFAULT ""
 	`,
 }
 

diff --git a/go/process/health_dao.go b/go/process/health_dao.go
@@ -19,6 +19,7 @@ package process
 import (
 	"time"
 
+	"fmt"
 	"github.com/github/orchestrator/go/config"
 	"github.com/github/orchestrator/go/db"
 	"github.com/openark/golib/log"
@@ -28,13 +29,12 @@ import (
 const registrationPollSeconds = 10
 
 type NodeHealth struct {
-	Hostname             string
-	Token                string
-	AppVersion           string
-	FirstSeenActive      string
-	LastSeenActive       string
-	MySQLBackendHostname string
-	MySQLBackendPort     int
+	Hostname        string
+	Token           string
+	AppVersion      string
+	FirstSeenActive string
+	LastSeenActive  string
+	DBBackend       string
 }
 
 type HealthStatus struct {
@@ -93,17 +93,22 @@ func RegisterNode(extraInfo string, command string, firstTime bool) (healthy boo
 		}
 	}
 	{
+		db_backend := ""
+		if config.Config.IsSQLite() {
+			db_backend = config.Config.SQLite3DataFile
+		} else {
+			db_backend = config.Config.MySQLOrchestratorHost + ":" +
+				fmt.Sprintf("%d", config.Config.MySQLOrchestratorPort)
+		}
 		sqlResult, err := db.ExecOrchestrator(`
 			insert ignore into node_health
-				(hostname, token, first_seen_active, last_seen_active, extra_info, command, app_version,
-				mysql_backend_hostname, mysql_backend_port)
+				(hostname, token, first_seen_active, last_seen_active, extra_info, command, app_version, db_backend)
 			values
-				(?, ?, now(), now(), ?, ?, ?, ?, ?)
+				(?, ?, now(), now(), ?, ?, ?, ?)
 			`,
 			ThisHostname, ProcessToken.Hash, extraInfo, command,
 			config.RuntimeCLIFlags.ConfiguredVersion,
-			config.Config.MySQLOrchestratorHost,
-			config.Config.MySQLOrchestratorPort,
+			db_backend,
 		)
 		if err != nil {
 			return false, log.Errore(err)
@@ -208,8 +213,7 @@ func ReadAvailableNodes(onlyHttpNodes bool) (nodes [](*NodeHealth), err error) {
 	}
 	query := `
 		select
-			hostname, token, app_version, first_seen_active, last_seen_active, mysql_backend_hostname,
-			mysql_backend_port
+			hostname, token, app_version, first_seen_active, last_seen_active, db_backend
 		from
 			node_health
 		where
@@ -221,13 +225,12 @@ func ReadAvailableNodes(onlyHttpNodes bool) (nodes [](*NodeHealth), err error) {
 
 	err = db.QueryOrchestrator(query, sqlutils.Args(registrationPollSeconds*2, extraInfo), func(m sqlutils.RowMap) error {
 		nodeHealth := &NodeHealth{
-			Hostname:             m.GetString("hostname"),
-			Token:                m.GetString("token"),
-			AppVersion:           m.GetString("app_version"),
-			FirstSeenActive:      m.GetString("first_seen_active"),
-			LastSeenActive:       m.GetString("last_seen_active"),
-			MySQLBackendHostname: m.GetString("mysql_backend_hostname"),
-			MySQLBackendPort:     m.GetInt("mysql_backend_port"),
+			Hostname:        m.GetString("hostname"),
+			Token:           m.GetString("token"),
+			AppVersion:      m.GetString("app_version"),
+			FirstSeenActive: m.GetString("first_seen_active"),
+			LastSeenActive:  m.GetString("last_seen_active"),
+			DBBackend:       m.GetString("db_backend"),
 		}
 		nodes = append(nodes, nodeHealth)
 		return nil

diff --git a/resources/public/js/status.js b/resources/public/js/status.js
@@ -28,7 +28,7 @@ $(document).ready(function () {
             '<tr><td></td>' +
             '<td><b>Hostname</b></td>' +
             '<td><b>Running Since</b></td>' +
-            '<td><b>MySQL Backend</b></td>' +
+            '<td><b>DB Backend</b></td>' +
             '<td><b>App Version</b></td></tr>'
         );
     	health.Details.AvailableNodes.forEach(function(node) {
@@ -52,7 +52,7 @@ $(document).ready(function () {
 				message += '</code>';
 
                 var running_since ='<span class="text-info">'+node.FirstSeenActive+'</span>';
-				var address = node.MySQLBackendHostname + ':' + node.MySQLBackendPort;
+				var address = node.DBBackend;
 
             addStatusTableData("Available node", message, running_since, address, app_version);
     	})