certstore适配fieldstat prometheusv2.1.5-20201114

5 files changed, 18 insertions, 6 deletions

diff --git a/program/include/cert_session.h b/program/include/cert_session.h
index fae1ac0..023c2b4 100644
--- a/program/include/cert_session.h
+++ b/program/include/cert_session.h
@@ -103,7 +103,7 @@ typedef struct {
 
 } x509_forge_thread;
 
-int cert_store_session_init();
+int cert_store_session_init(const char *main_profile);
 
 void sigproc(int __attribute__((__unused__))sig);
 
diff --git a/program/src/cert_conf.cpp b/program/src/cert_conf.cpp
index c4816ff..4606603 100644
--- a/program/src/cert_conf.cpp
+++ b/program/src/cert_conf.cpp
@@ -123,6 +123,7 @@ static int load_module_config(const char *config)
         mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Certsotre redis port invalid");
         goto finish;
     }
+
 finish:
     return xret;
 }
diff --git a/program/src/cert_session.cpp b/program/src/cert_session.cpp
index 2be2249..1b01dec 100644
--- a/program/src/cert_session.cpp
+++ b/program/src/cert_session.cpp
@@ -2131,20 +2131,29 @@ void sigproc(int __attribute__((__unused__))sig)
     exit(1);
 }
 
-static int mesa_fiel_stat_init()
+static int mesa_fiel_stat_init(const char *main_profile)
 {
-	int value=0, i=0;
+	int value=0, i=0, prometheus_port =0;
 	char stat_path[128] ={0}, pname[32]={0};
+	char prometheus_url_path[1024] = {0};
 
     struct _initer_addr_t *addr_t = &(cfg_instanec()->addr_t);
 
 	g_FP_instance.favorite=FS_CALC_CURRENT;
 	strcpy(g_FP_instance.histogram_bins, FP_HISTOGRAM_BINS);
 
+	MESA_load_profile_int_def(main_profile, "stat", "statsd_set_prometheus_port", &(prometheus_port), 9001);
+	MESA_load_profile_string_def(main_profile, "stat", "statsd_set_prometheus_url_path", prometheus_url_path, sizeof(prometheus_url_path), "/certstore_prometheus");
+	FS_library_set_prometheus_port(prometheus_port);
+	FS_library_set_prometheus_url_path(prometheus_url_path);
+	FS_library_init();
+
 	screen_stat_handle_t fs=NULL;
 	fs=FS_create_handle();
 	rt_get_pname_by_pid(getpid(), &pname[0]);
 	FS_set_para(fs, APP_NAME, pname, strlen(pname)+1);
+	value=1;
+	FS_set_para(fs, OUTPUT_PROMETHEUS, &value, sizeof(value));
 	value=0;
 	FS_set_para(fs, FLUSH_BY_DATE, &value, sizeof(value));
 	snprintf(stat_path, 128, "%s/fs2_%s.status", "./logs", pname);
@@ -2328,9 +2337,9 @@ int maat_feather_init()
     return 0;
 }
 
-int cert_store_session_init()
+int cert_store_session_init(const char *main_profile)
 {
-    mesa_fiel_stat_init();
+    mesa_fiel_stat_init(main_profile);
 
     maat_feather_init();
 
diff --git a/program/src/cert_store.cpp b/program/src/cert_store.cpp
index 3df16f7..223dac3 100644
--- a/program/src/cert_store.cpp
+++ b/program/src/cert_store.cpp
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
 		signal(signals[i], __signal_handler_cb);
 	}
 
-    cert_store_session_init();
+    cert_store_session_init(CERT_BASIC_CFG);
 
     return 0;
 }
diff --git a/resource/conf/cert_store.ini b/resource/conf/cert_store.ini
index 93661b5..bf2f19e 100644
--- a/resource/conf/cert_store.ini
+++ b/resource/conf/cert_store.ini
@@ -57,4 +57,6 @@ dbindex = 4
 [stat]
 statsd_server=192.168.10.72
 statsd_port=8126
+statsd_set_prometheus_port=9001
+statsd_set_prometheus_url_path=/certstore_prometheus