lib/splash/config.rb in prometheus-splash-0.5.2 vs lib/splash/config.rb in prometheus-splash-0.5.3
- old
+ new
@@ -20,10 +20,11 @@
self[:prometheus_pushgateway_host] = (config_from_file[:prometheus][:pushgateway][:host])? config_from_file[:prometheus][:pushgateway][:host] : PROMETHEUS_PUSHGATEWAY_HOST
self[:prometheus_pushgateway_port] = (config_from_file[:prometheus][:pushgateway][:port])? config_from_file[:prometheus][:pushgateway][:port] : PROMETHEUS_PUSHGATEWAY_PORT
self[:daemon_process_name] = (config_from_file[:daemon][:process_name])? config_from_file[:daemon][:process_name] : DAEMON_PROCESS_NAME
self[:daemon_logmon_scheduling] = (config_from_file[:daemon][:logmon_scheduling])? config_from_file[:daemon][:logmon_scheduling] : DAEMON_LOGMON_SCHEDULING
self[:daemon_metrics_scheduling] = (config_from_file[:daemon][:metrics_scheduling])? config_from_file[:daemon][:metrics_scheduling] : DAEMON_METRICS_SCHEDULING
+ self[:daemon_procmon_scheduling] = (config_from_file[:daemon][:procmon_scheduling])? config_from_file[:daemon][:procmon_scheduling] : DAEMON_PROCMON_SCHEDULING
self[:execution_template_tokens] = EXECUTION_TEMPLATE_TOKENS_LIST
self[:execution_template_path] = (config_from_file[:templates][:execution][:path])? config_from_file[:templates][:execution][:path] : EXECUTION_TEMPLATE
self[:pid_path] = (config_from_file[:daemon][:paths][:pid_path])? config_from_file[:daemon][:paths][:pid_path] : DAEMON_PID_PATH
self[:trace_path] = (config_from_file[:daemon][:paths][:trace_path])? config_from_file[:daemon][:paths][:trace_path] : TRACE_PATH
self[:pid_file] = (config_from_file[:daemon][:files][:pid_file])? config_from_file[:daemon][:files][:pid_file] : DAEMON_PID_FILE
@@ -32,10 +33,11 @@
self[:transports] = {} ; self[:transports].merge! TRANSPORTS_STRUCT ; self[:transports].merge! config_from_file[:transports] if config_from_file[:transports]
self[:backends] = {} ; self[:backends].merge! BACKENDS_STRUCT ; self[:backends].merge! config_from_file[:backends] if config_from_file[:backends]
self[:loggers] = {} ; self[:loggers].merge! LOGGERS_STRUCT ; self[:loggers].merge! config_from_file[:loggers] if config_from_file[:loggers]
+ self[:processes] = (config_from_file[:processes])? config_from_file[:processes] : {}
self[:logs] = (config_from_file[:logs])? config_from_file[:logs] : {}
self[:commands] = (config_from_file[:commands])? config_from_file[:commands] : {}
end
@@ -55,10 +57,14 @@
def daemon_logmon_scheduling
return self[:daemon_logmon_scheduling]
end
+ def daemon_procmon_scheduling
+ return self[:daemon_procmon_scheduling]
+ end
+
def daemon_metrics_scheduling
return self[:daemon_metrics_scheduling]
end
def execution_template_path
@@ -71,9 +77,13 @@
return self[:logs]
end
def commands
return self[:commands]
+ end
+
+ def processes
+ return self[:processes]
end
def author
return self[:author]
end