lib/splash/config.rb in prometheus-splash-0.7.0 vs lib/splash/config.rb in prometheus-splash-0.8.0

- old
+ new

@@ -22,15 +22,19 @@ self[:author] = "#{AUTHOR} <#{EMAIL}>" self[:copyright] = "#{COPYRIGHT} #{LICENSE}" self[:prometheus_url] = (config_from_file[:prometheus][:url])? config_from_file[:prometheus][:url] : PROMETHEUS_URL self[:prometheus_pushgateway_url] = (config_from_file[:prometheus][:pushgateway])? config_from_file[:prometheus][:pushgateway] : PROMETHEUS_PUSHGATEWAY_URL + self[:prometheus_alertmanager_url] = (config_from_file[:prometheus][:alertmanager])? config_from_file[:prometheus][:alertmanager] : PROMETHEUS_ALERTMANAGER_URL 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[:daemon_pid_file] = (config_from_file[:daemon][:files][:pid_file])? config_from_file[:daemon][:files][:pid_file] : DAEMON_PID_FILE + self[:daemon_stdout_trace] = (config_from_file[:daemon][:files][:stdout_trace])? config_from_file[:daemon][:files][:stdout_trace] : DAEMON_STDOUT_TRACE + self[:daemon_stderr_trace] = (config_from_file[:daemon][:files][:stderr_trace])? config_from_file[:daemon][:files][:stderr_trace] : DAEMON_STDERR_TRACE self[:webadmin_port] = (config_from_file[:webadmin][:port])? config_from_file[:webadmin][:port] : WEBADMIN_PORT self[:webadmin_ip] = (config_from_file[:webadmin][:ip])? config_from_file[:webadmin][:ip] : WEBADMIN_IP self[:webadmin_proxy] = (config_from_file[:webadmin][:proxy])? config_from_file[:webadmin][:proxy] : WEBADMIN_PROXY @@ -38,28 +42,26 @@ self[:webadmin_pid_file] = (config_from_file[:webadmin][:files][:pid_file])? config_from_file[:webadmin][:files][:pid_file] : WEBADMIN_PID_FILE self[:webadmin_stdout_trace] = (config_from_file[:webadmin][:files][:stdout_trace])? config_from_file[:webadmin][:files][:stdout_trace] : WEBADMIN_STDOUT_TRACE self[:webadmin_stderr_trace] = (config_from_file[:webadmin][:files][:stderr_trace])? config_from_file[:webadmin][:files][:stderr_trace] : WEBADMIN_STDERR_TRACE - self[:pid_path] = (config_from_file[:daemon][:paths][:pid_path])? config_from_file[:daemon][:paths][:pid_path] : PID_PATH - self[:trace_path] = (config_from_file[:daemon][:paths][:trace_path])? config_from_file[:daemon][:paths][:trace_path] : TRACE_PATH + self[:pid_path] = (config_from_file[:paths][:pid_path])? config_from_file[:paths][:pid_path] : PID_PATH + self[:trace_path] = (config_from_file[:paths][:trace_path])? config_from_file[:paths][:trace_path] : TRACE_PATH 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_file] = (config_from_file[:daemon][:files][:pid_file])? config_from_file[:daemon][:files][:pid_file] : DAEMON_PID_FILE - self[:stdout_trace] = (config_from_file[:daemon][:files][:stdout_trace])? config_from_file[:daemon][:files][:stdout_trace] : DAEMON_STDOUT_TRACE - self[:stderr_trace] = (config_from_file[:daemon][:files][:stderr_trace])? config_from_file[:daemon][:files][:stderr_trace] : DAEMON_STDERR_TRACE 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] : {} self[:sequences] = (config_from_file[:sequences])? config_from_file[:sequences] : {} + self[:transfers] = (config_from_file[:transfers])? config_from_file[:transfers] : {} end # @!group accessors on configurations Items @@ -85,10 +87,16 @@ # @return [Hash] def transports return self[:transports] end + # getter for transfers Hash Config sample + # @return [Hash] + def transfers + return self[:transfers] + end + # getter for daemon_logmon_scheduling Hash Config sample # @return [Hash] def daemon_logmon_scheduling return self[:daemon_logmon_scheduling] end @@ -103,10 +111,35 @@ # @return [Hash] def daemon_metrics_scheduling return self[:daemon_metrics_scheduling] end + # getter for daemon_process_name Config sample + # @return [String] + def daemon_process_name + return self[:daemon_process_name] + end + + + # getter for daemon_full_pid_path Config sample + # @return [String] + def daemon_full_pid_path + return "#{self[:pid_path]}/#{self[:daemon_pid_file]}" + end + + # getter for daemon_full_stdout_trace_path Config sample + # @return [String] + def daemon_full_stdout_trace_path + return "#{self[:trace_path]}/#{self[:daemon_stdout_trace]}" + end + + # getter for daemon_full_stderr_trace_path Config sample + # @return [String] + def daemon_full_stderr_trace_path + return "#{self[:trace_path]}/#{self[:daemon_stderr_trace]}" + end + # getter for execution_template_path Hash Config sample # @return [String] def execution_template_path return self[:execution_template_path] end @@ -213,39 +246,20 @@ # @return [String] def prometheus_pushgateway_url return self[:prometheus_pushgateway_url] end - # getter for prometheus_url Config sample + # getter for prometheus_alertmanager_url Config sample # @return [String] - def prometheus_url - return self[:prometheus_url] + def prometheus_alertmanager_url + return self[:prometheus_alertmanager_url] end - # getter for daemon_process_name Config sample + # getter for prometheus_url Config sample # @return [String] - def daemon_process_name - return self[:daemon_process_name] - end - - - # getter for daemon_full_pid_path Config sample - # @return [String] - def daemon_full_pid_path - return "#{self[:pid_path]}/#{self[:pid_file]}" - end - - # getter for daemon_full_stdout_trace_path Config sample - # @return [String] - def daemon_full_stdout_trace_path - return "#{self[:trace_path]}/#{self[:stdout_trace]}" - end - - # getter for daemon_full_stderr_trace_path Config sample - # @return [String] - def daemon_full_stderr_trace_path - return "#{self[:trace_path]}/#{self[:stderr_trace]}" + def prometheus_url + return self[:prometheus_url] end # @!endgroup private