merging with upstream libfnord WIP (0d029034) · Commits · github_fork / Clip

src/cli.cc

+2 −8

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		#include <vector>
		#include <fnord-base/exceptionhandler.h>
		#include <fnord-base/random.h>
		#include <fnord/system/signalhandler.h>
		#include <environment.h>
		#include <cli/cli.h>

		@@ -25,14 +24,9 @@ static const char kCrashErrorMsg[] =
		"github.com/paulasmuth/fnordmetric";

		int main(int argc, const char** argv) {
		/* setup environment */
		fnord::CatchAndAbortExceptionHandler ehandler(kCrashErrorMsg);
		ehandler.installGlobalHandlers();
		fnord::system::SignalHandler::ignoreSIGHUP();
		fnord::system::SignalHandler::ignoreSIGPIPE();
		fnord::Random::init();
		fnord::Application::init();
		fnord::Application::logToStderr();

		/* execute commandline */
		cli::CLI::parseArgs(env(), argc, argv);
		cli::CLI::executeSafely(env());
		return 0;

+0 −3

Original line number	Diff line number	Diff line
		@@ -24,9 +24,6 @@ namespace fnordmetric {
		namespace cli {

		void CLI::parseArgs(Environment* env, const std::vector<std::string>& argv) {
		fnord::Application::init();
		fnord::Application::logToStderr();

		auto flags = env->flags();

		// Execute queries from the commandline:

+1 −5

Original line number	Diff line number	Diff line
		@@ -9,9 +9,6 @@
		*/
		#include <memory>
		#include <environment.h>
		#include <util/logoutputstream.h>

		using fnord::util::LogOutputStream;

		namespace fnordmetric {

		@@ -20,8 +17,7 @@ Environment* env() {
		return &global_env;
		}

		Environment::Environment() :
		logger_(new LogOutputStream(fnord::io::OutputStream::getStderr())) {}
		Environment::Environment() {}

		void Environment::setVerbose(bool verbose) {
		verbose_ = verbose;

+4 −7

Original line number	Diff line number	Diff line
		@@ -13,20 +13,18 @@
		#include <fnord-base/cli/flagparser.h>
		#include "config.h"

		using fnord::cli::FlagParser;

		namespace fnordmetric {

		class Environment {
		public:
		Environment();

		inline cli::FlagParser* flags() {
		inline FlagParser* flags() {
		return &flag_parser_;
		}

		inline fnord::util::Logger* logger() {
		return logger_.get();
		}

		inline bool verbose() {
		return verbose_;
		}
		@@ -35,8 +33,7 @@ public:

		protected:
		bool verbose_;
		cli::FlagParser flag_parser_;
		std::unique_ptr<fnord::util::Logger> logger_;
		FlagParser flag_parser_;
		};

		Environment* env();

+5 −16

Original line number	Diff line number	Diff line
		@@ -17,22 +17,15 @@
		#include <fnord-base/inspect.h>
		#include <fnord-base/random.h>
		#include <fnord-http/httpserver.h>
		#include <fnord/io/fileutil.h>
		#include <fnord/io/inputstream.h>
		#include <fnord/io/outputstream.h>
		#include <fnord-base/io/fileutil.h>
		#include <fnord-base/io/inputstream.h>
		#include <fnord-base/io/outputstream.h>
		#include <fnord-base/net/udpserver.h>
		#include <fnord-base/stats/statsd.h>
		#include <fnord/thread/threadpool.h>
		#include <fnord-base/thread/threadpool.h>
		#include <fnord-metricdb/metricservice.h>
		#include <fnord-metricdb/metricserviceadapter.h>
		#include <fnord/service/groups/groupsservice.h>
		#include <fnord/service/groups/groupsserviceadapter.h>
		#include <fnord/service/keyvalue/keyvalueservice.h>
		#include <fnord/service/keyvalue/keyvalueserviceadapter.h>
		#include <fnord/system/signalhandler.h>
		#include <cli/flagparser.h>
		#include <fnord-base/cli/flagparser.h>
		#include <environment.h>
		#include <adminui.h>
		#include <httpapi.h>

		using namespace fnordmetric;
		@@ -45,10 +38,6 @@ using fnord::json::JSONRPC;
		using fnord::json::JSONRPCHTTPAdapter;
		using fnord::metric_service::MetricService;
		using fnord::metric_service::MetricServiceAdapter;
		using fnord::groups_service::GroupsService;
		using fnord::groups_service::GroupsServiceAdapter;
		using fnord::keyvalue_service::KeyValueService;
		using fnord::keyvalue_service::KeyValueServiceAdapter;
		using fnord::thread::Task;
		using fnord::thread::TaskScheduler;
		using fnord::statsd::StatsdServer;