Expand $PID in Metrics filename.

brixen · brixen · commit 70ba66f3a86e · 2015-09-02T21:40:34.000-07:00
diff --git a/vm/metrics.cpp b/vm/metrics.cpp
@@ -39,12 +39,16 @@ namespace rubinius {
   using namespace utilities;
 
   namespace metrics {
-    FileEmitter::FileEmitter(MetricsMap& map, std::string path)
+    FileEmitter::FileEmitter(STATE, MetricsMap& map, std::string path)
       : MetricsEmitter()
       , metrics_map_(map)
       , path_(path)
       , fd_(-1)
     {
+      // TODO: Make this a proper feature of the config facility.
+      state->shared().env()->expand_config_value(
+          path_, "$PID", state->shared().pid.c_str());
+
       initialize();
     }
 
@@ -254,7 +258,7 @@ namespace rubinius {
             state->shared().config.system_metrics_statsd_server.value,
             state->shared().config.system_metrics_statsd_prefix.value);
       } else if(state->shared().config.system_metrics_target.value.compare("none")) {
-        emitter_ = new FileEmitter(metrics_map_,
+        emitter_ = new FileEmitter(state, metrics_map_,
             state->shared().config.system_metrics_target.value);
       }
     }
diff --git a/vm/metrics.hpp b/vm/metrics.hpp
@@ -299,7 +299,7 @@ namespace rubinius {
       int fd_;
 
     public:
-      FileEmitter(MetricsMap& map, std::string path);
+      FileEmitter(STATE, MetricsMap& map, std::string path);
       virtual ~FileEmitter();
 
       void send_metrics();

Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,16 @@ namespace rubinius {`
`39`	`39`	`using namespace utilities;`
`40`	`40`
`41`	`41`	`namespace metrics {`
`42`		`- FileEmitter::FileEmitter(MetricsMap& map, std::string path)`
	`42`	`+ FileEmitter::FileEmitter(STATE, MetricsMap& map, std::string path)`
`43`	`43`	`: MetricsEmitter()`
`44`	`44`	`, metrics_map_(map)`
`45`	`45`	`, path_(path)`
`46`	`46`	`, fd_(-1)`
`47`	`47`	`{`
	`48`	`+ // TODO: Make this a proper feature of the config facility.`
	`49`	`+ state->shared().env()->expand_config_value(`
	`50`	`+ path_, "$PID", state->shared().pid.c_str());`
	`51`	`+`
`48`	`52`	`initialize();`
`49`	`53`	`}`
`50`	`54`
`@@ -254,7 +258,7 @@ namespace rubinius {`
`254`	`258`	`state->shared().config.system_metrics_statsd_server.value,`
`255`	`259`	`state->shared().config.system_metrics_statsd_prefix.value);`
`256`	`260`	`} else if(state->shared().config.system_metrics_target.value.compare("none")) {`
`257`		`- emitter_ = new FileEmitter(metrics_map_,`
	`261`	`+ emitter_ = new FileEmitter(state, metrics_map_,`
`258`	`262`	`state->shared().config.system_metrics_target.value);`
`259`	`263`	`}`
`260`	`264`	`}`