Metric return node name

Author: Heran Yang

fileserver/metrics/metrics.go

@@ -140,6 +140,7 @@ func publishMetrics() error {
 		MetricType:    "gauge",
 		ComponentName: ComponentName,
 		MetricHelp:    "The number of currently running http requests.",
+		NodeName:      option.NodeName,
 	}
 
 	data, err := json.Marshal(msg)

fileserver/option/option.go

@@ -79,6 +79,9 @@ var (
 	// seahub
 	SeahubURL     string
 	JWTPrivateKey string
+
+	// metric
+	NodeName string
 )
 
 type DBOption struct {
@@ -159,6 +162,11 @@ func LoadFileServerOptions(centralDir string) {
 	if GroupTableName == "" {
 		GroupTableName = "Group"
 	}
+
+	NodeName = os.Getenv("NODE_NAME")
+	if NodeName == "" {
+		NodeName = "default"
+	}
 }
 
 func parseFileServerSection(section *ini.Section) {

server/metric-mgr.c

@@ -99,6 +99,7 @@ publish_in_flight_request (SeafMetricManager *mgr)
     json_object_set_new (obj, "metric_type", json_string("gauge"));
     json_object_set_new (obj, "component_name", json_string(COMPONENT_NAME));
     json_object_set_new (obj, "metric_help", json_string("The number of currently running http requests."));
+    json_object_set_new (obj, "node_name", json_string(seaf->node_name));
 
     msg = json_dumps (obj, JSON_COMPACT);
 

server/seafile-session.c

@@ -117,6 +117,7 @@ load_config (SeafileSession *session, const char *config_file_path)
     const char *private_key = NULL;
     const char *site_root = NULL;
     const char *log_to_stdout = NULL;
+    const char *node_name = NULL;
 
     config = g_key_file_new ();
     if (!g_key_file_load_from_file (config, config_file_path,
@@ -144,6 +145,7 @@ load_config (SeafileSession *session, const char *config_file_path)
     log_to_stdout = g_getenv("SEAFILE_LOG_TO_STDOUT");
     notif_server = g_getenv("INNER_NOTIFICATION_SERVER_URL");
     enable_notif_server = g_getenv("ENABLE_NOTIFICATION_SERVER");
+    node_name = g_getenv("NODE_NAME");
 
     if (!private_key) {
         seaf_warning ("Failed to read JWT_PRIVATE_KEY.\n");
@@ -166,6 +168,11 @@ load_config (SeafileSession *session, const char *config_file_path)
         session->log_to_stdout = TRUE;
     }
 
+    if (!node_name || g_strcmp0 (node_name, "") == 0) {
+        node_name = "default";
+    }
+    session->node_name = g_strdup (node_name);
+
 out:
     if (ret < 0) {
         if (config)

server/seafile-session.h

@@ -100,6 +100,7 @@ struct _SeafileSession {
 
     // For metric
     SeafMetricManager *metric_mgr; 
+    char              *node_name;
 
     ObjCache *obj_cache;