Reformat

bin/autoconfig/CCmdLineParser.cc

@@ -12,137 +12,107 @@
 
 #include <iostream>
 
-namespace ml
-{
-namespace autoconfig
-{
+namespace ml {
+namespace autoconfig {
 
-const std::string CCmdLineParser::DESCRIPTION =
-"Usage: autoconfig [options]\n"
-"Options";
+const std::string CCmdLineParser::DESCRIPTION = "Usage: autoconfig [options]\n"
+                                                "Options";
 
 bool CCmdLineParser::parse(int argc,
-                           const char * const *argv,
-                           std::string &logProperties,
-                           std::string &logPipe,
-                           char &delimiter,
-                           bool &lengthEncodedInput,
-                           std::string &timeField,
-                           std::string &timeFormat,
-                           std::string &configFile,
-                           std::string &inputFileName,
-                           bool &isInputFileNamedPipe,
-                           std::string &outputFileName,
-                           bool &isOutputFileNamedPipe,
-                           bool &verbose,
-                           bool &writeDetectorConfigs)
-{
-    try
-    {
+                           const char* const* argv,
+                           std::string& logProperties,
+                           std::string& logPipe,
+                           char& delimiter,
+                           bool& lengthEncodedInput,
+                           std::string& timeField,
+                           std::string& timeFormat,
+                           std::string& configFile,
+                           std::string& inputFileName,
+                           bool& isInputFileNamedPipe,
+                           std::string& outputFileName,
+                           bool& isOutputFileNamedPipe,
+                           bool& verbose,
+                           bool& writeDetectorConfigs) {
+    try {
         boost::program_options::options_description desc(DESCRIPTION);
-        desc.add_options()
-            ("help", "Display this information and exit")
-            ("version", "Display version information and exit")
-            ("logProperties", boost::program_options::value<std::string>(),
-                        "Optional logger properties file")
-            ("logPipe", boost::program_options::value<std::string>(),
-                        "Optional log to named pipe")
-            ("delimiter", boost::program_options::value<char>(),
-                        "Optional delimiter character for delimited data formats - default is ',' (comma separated)")
-            ("lengthEncodedInput",
-                        "Take input in length encoded binary format - default is delimited")
-            ("timefield", boost::program_options::value<std::string>(),
-                        "Optional name of the field containing the timestamp - default is 'time'")
-            ("timeformat", boost::program_options::value<std::string>(),
-                        "Optional format of the date in the time field in strptime code - default is the epoch time in seconds")
-            ("config", boost::program_options::value<std::string>(),
-                        "Optional configuration file")
-            ("input", boost::program_options::value<std::string>(),
-                        "Optional file to read input from - not present means read from STDIN")
-            ("inputIsPipe", "Specified input file is a named pipe")
-            ("output", boost::program_options::value<std::string>(),
-                        "Optional file to write output to - not present means write to STDOUT")
-            ("outputIsPipe", "Specified output file is a named pipe")
-            ("verbose", "Output information about all detectors including those that have been discarded")
-            ("writeDetectorConfigs",
-                        "Output the detector configurations in JSON format")
-        ;
+        desc.add_options()("help", "Display this information and exit")("version", "Display version information and exit")(
+            "logProperties", boost::program_options::value<std::string>(), "Optional logger properties file")(
+            "logPipe", boost::program_options::value<std::string>(), "Optional log to named pipe")(
+            "delimiter",
+            boost::program_options::value<char>(),
+            "Optional delimiter character for delimited data formats - default is ',' (comma separated)")(
+            "lengthEncodedInput", "Take input in length encoded binary format - default is delimited")(
+            "timefield",
+            boost::program_options::value<std::string>(),
+            "Optional name of the field containing the timestamp - default is 'time'")(
+            "timeformat",
+            boost::program_options::value<std::string>(),
+            "Optional format of the date in the time field in strptime code - default is the epoch time in seconds")(
+            "config", boost::program_options::value<std::string>(), "Optional configuration file")(
+            "input", boost::program_options::value<std::string>(), "Optional file to read input from - not present means read from STDIN")(
+            "inputIsPipe", "Specified input file is a named pipe")(
+            "output", boost::program_options::value<std::string>(), "Optional file to write output to - not present means write to STDOUT")(
+            "outputIsPipe", "Specified output file is a named pipe")(
+            "verbose", "Output information about all detectors including those that have been discarded")(
+            "writeDetectorConfigs", "Output the detector configurations in JSON format");
 
         boost::program_options::variables_map vm;
         boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
         boost::program_options::notify(vm);
 
-        if (vm.count("help") > 0)
-        {
+        if (vm.count("help") > 0) {
             std::cerr << desc << std::endl;
             return false;
         }
-        if (vm.count("version") > 0)
-        {
+        if (vm.count("version") > 0) {
             std::cerr << ver::CBuildInfo::fullInfo() << std::endl;
             return false;
         }
-        if (vm.count("logProperties") > 0)
-        {
+        if (vm.count("logProperties") > 0) {
             logProperties = vm["logProperties"].as<std::string>();
         }
-        if (vm.count("logPipe") > 0)
-        {
+        if (vm.count("logPipe") > 0) {
             logPipe = vm["logPipe"].as<std::string>();
         }
-        if (vm.count("delimiter") > 0)
-        {
+        if (vm.count("delimiter") > 0) {
             delimiter = vm["delimiter"].as<char>();
         }
-        if (vm.count("lengthEncodedInput") > 0)
-        {
+        if (vm.count("lengthEncodedInput") > 0) {
             lengthEncodedInput = true;
         }
-        if (vm.count("timefield") > 0)
-        {
+        if (vm.count("timefield") > 0) {
             timeField = vm["timefield"].as<std::string>();
         }
-        if (vm.count("timeformat") > 0)
-        {
+        if (vm.count("timeformat") > 0) {
             timeFormat = vm["timeformat"].as<std::string>();
         }
-        if (vm.count("config") > 0)
-        {
+        if (vm.count("config") > 0) {
             configFile = vm["config"].as<std::string>();
         }
-        if (vm.count("input") > 0)
-        {
+        if (vm.count("input") > 0) {
             inputFileName = vm["input"].as<std::string>();
         }
-        if (vm.count("inputIsPipe") > 0)
-        {
+        if (vm.count("inputIsPipe") > 0) {
             isInputFileNamedPipe = true;
         }
-        if (vm.count("output") > 0)
-        {
+        if (vm.count("output") > 0) {
             outputFileName = vm["output"].as<std::string>();
         }
-        if (vm.count("outputIsPipe") > 0)
-        {
+        if (vm.count("outputIsPipe") > 0) {
             isOutputFileNamedPipe = true;
         }
-        if (vm.count("verbose") > 0)
-        {
+        if (vm.count("verbose") > 0) {
             verbose = true;
         }
-        if (vm.count("writeDetectorConfigs") > 0)
-        {
+        if (vm.count("writeDetectorConfigs") > 0) {
             writeDetectorConfigs = true;
         }
-    }
-    catch (std::exception &e)
-    {
+    } catch (std::exception& e) {
         std::cerr << "Error processing command line: " << e.what() << std::endl;
         return false;
     }
 
     return true;
 }
-
 }
 }

bin/autoconfig/CCmdLineParser.h

@@ -11,10 +11,8 @@
 #include <string>
 #include <vector>
 
-namespace ml
-{
-namespace autoconfig
-{
+namespace ml {
+namespace autoconfig {
 
 //! \brief Very simple command line parser.
 //!
@@ -24,34 +22,31 @@ namespace autoconfig
 //! IMPLEMENTATION DECISIONS:\n
 //! Put in a class rather than main to allow testing.
 //!
-class CCmdLineParser
-{
-    public:
-        using TStrVec = std::vector<std::string>;
-
-    public:
-        //! Parse the arguments and return options if appropriate.
-        static bool parse(int argc,
-                          const char * const *argv,
-                          std::string &logProperties,
-                          std::string &logPipe,
-                          char &delimiter,
-                          bool &lengthEncodedInput,
-                          std::string &timeField,
-                          std::string &timeFormat,
-                          std::string &configFile,
-                          std::string &inputFileName,
-                          bool &isInputFileNamedPipe,
-                          std::string &outputFileName,
-                          bool &isOutputFileNamedPipe,
-                          bool &verbose,
-                          bool &writeDetectorConfigs);
-
-    private:
-        static const std::string DESCRIPTION;
+class CCmdLineParser {
+public:
+    using TStrVec = std::vector<std::string>;
+
+public:
+    //! Parse the arguments and return options if appropriate.
+    static bool parse(int argc,
+                      const char* const* argv,
+                      std::string& logProperties,
+                      std::string& logPipe,
+                      char& delimiter,
+                      bool& lengthEncodedInput,
+                      std::string& timeField,
+                      std::string& timeFormat,
+                      std::string& configFile,
+                      std::string& inputFileName,
+                      bool& isInputFileNamedPipe,
+                      std::string& outputFileName,
+                      bool& isOutputFileNamedPipe,
+                      bool& verbose,
+                      bool& writeDetectorConfigs);
+
+private:
+    static const std::string DESCRIPTION;
 };
-
-
 }
 }
 

bin/autoconfig/Main.cc

@@ -14,8 +14,8 @@
 //! Standalone program.
 //!
 #include <core/CLogger.h>
-#include <core/CoreTypes.h>
 #include <core/CProcessPriority.h>
+#include <core/CoreTypes.h>
 
 #include <ver/CBuildInfo.h>
 
@@ -37,23 +37,21 @@
 
 #include <stdlib.h>
 
-
-int main(int argc, char **argv)
-{
+int main(int argc, char** argv) {
     // Read command line options
     std::string logProperties;
     std::string logPipe;
-    char        delimiter(',');
-    bool        lengthEncodedInput(false);
+    char delimiter(',');
+    bool lengthEncodedInput(false);
     std::string timeField("time");
     std::string timeFormat;
     std::string configFile;
     std::string inputFileName;
-    bool        isInputFileNamedPipe(false);
+    bool isInputFileNamedPipe(false);
     std::string outputFileName;
-    bool        isOutputFileNamedPipe(false);
-    bool        verbose(false);
-    bool        writeDetectorConfigs(false);
+    bool isOutputFileNamedPipe(false);
+    bool verbose(false);
+    bool writeDetectorConfigs(false);
     if (ml::autoconfig::CCmdLineParser::parse(argc,
                                               argv,
                                               logProperties,
@@ -68,20 +66,15 @@ int main(int argc, char **argv)
                                               outputFileName,
                                               isOutputFileNamedPipe,
                                               verbose,
-                                              writeDetectorConfigs) == false)
-    {
+                                              writeDetectorConfigs) == false) {
         return EXIT_FAILURE;
     }
 
     // Construct the IO manager before reconfiguring the logger, as it performs
     // std::ios actions that only work before first use
-    ml::api::CIoManager ioMgr(inputFileName,
-                              isInputFileNamedPipe,
-                              outputFileName,
-                              isOutputFileNamedPipe);
+    ml::api::CIoManager ioMgr(inputFileName, isInputFileNamedPipe, outputFileName, isOutputFileNamedPipe);
 
-    if (ml::core::CLogger::instance().reconfigure(logPipe, logProperties) == false)
-    {
+    if (ml::core::CLogger::instance().reconfigure(logPipe, logProperties) == false) {
         LOG_FATAL("Could not reconfigure logging");
         return EXIT_FAILURE;
     }
@@ -93,20 +86,16 @@ int main(int argc, char **argv)
 
     ml::core::CProcessPriority::reducePriority();
 
-    if (ioMgr.initIo() == false)
-    {
+    if (ioMgr.initIo() == false) {
         LOG_FATAL("Failed to initialise IO");
         return EXIT_FAILURE;
     }
 
     typedef boost::scoped_ptr<ml::api::CInputParser> TScopedInputParserP;
     TScopedInputParserP inputParser;
-    if (lengthEncodedInput)
-    {
+    if (lengthEncodedInput) {
         inputParser.reset(new ml::api::CLengthEncodedInputParser(ioMgr.inputStream()));
-    }
-    else
-    {
+    } else {
         inputParser.reset(new ml::api::CCsvInputParser(ioMgr.inputStream(), delimiter));
     }
 
@@ -125,8 +114,7 @@ int main(int argc, char **argv)
                                    0, // no persistence at present
                                    *inputParser,
                                    configurer);
-    if (skeleton.ioLoop() == false)
-    {
+    if (skeleton.ioLoop() == false) {
         LOG_FATAL("Ml autoconfig failed");
         return EXIT_FAILURE;
     }