upd: various logging updates

[cassiopeia.git] / src / apps / signer.cpp

diff --git a/src/apps/signer.cpp b/src/apps/signer.cpp
index 1e1a5894fc59e6da66384ab1c714c7a3196100dd..b955943452cf93bd31c36529d1d43cf33204a29c 100644 (file)
--- a/src/apps/signer.cpp
+++ b/src/apps/signer.cpp
@@ -1,17 +1,19 @@
 #include <iostream>
 #include <fstream>
 #include <streambuf>
+#include <stdexcept>
 
-#include "database.h"
-#include "mysql.h"
-#include "simpleOpensslSigner.h"
+#include "db/database.h"
+#include "db/mysql.h"
+#include "crypto/simpleOpensslSigner.h"
+#include "crypto/remoteSigner.h"
+#include "crypto/sslUtil.h"
+#include "io/bios.h"
+#include "io/slipBio.h"
+#include "io/recordHandler.h"
+#include "log/logger.hpp"
 #include "util.h"
-#include "bios.h"
-#include "slipBio.h"
-#include "remoteSigner.h"
-#include "sslUtil.h"
 #include "config.h"
-#include "recordHandler.h"
 
 #ifdef NO_DAEMON
 #define DAEMON false
@@ -19,48 +21,57 @@
 #define DAEMON true
 #endif
 
-int handlermain( int argc, const char* argv[] );
-
 extern std::string serialPath;
-extern std::vector<Profile> profiles;
 
-int main( int argc, const char* argv[] ) {
+int main( int argc, const char* argv[] ) try {
     ( void ) argc;
     ( void ) argv;
 
     std::string path;
 
-    if( DAEMON ) {
-        path = "/etc/cacert/cassiopeia/cassiopeia.conf";
-    } else {
-        path = "config.txt";
-    }
-
+#ifdef NDEBUG
+    path = "/etc/cacert/cassiopeia/cassiopeia.conf";
+#else
+    path = "config.txt";
+#endif
 
     if( parseConfig( path ) != 0 ) {
+        logger::fatal( "Could not parse configuration file." );
         return -1;
     }
 
     std::shared_ptr<int> ssl_lib = ssl_lib_ref;
 
     if( serialPath == "" ) {
-        std::cout << "Error: no serial device is given" << std::endl;
+        logger::fatal( "Error: No device for the serial connection was given." );
         return -1;
     }
 
     std::shared_ptr<BIO> conn = openSerial( serialPath );
     std::shared_ptr<BIO> slip1( BIO_new( toBio<SlipBIO>() ), BIO_free );
-    ( ( SlipBIO* )slip1->ptr )->setTarget( std::shared_ptr<OpensslBIO>( new OpensslBIOWrapper( conn ) ) );
+    static_cast<SlipBIO*>( slip1->ptr )->setTarget( std::shared_ptr<OpensslBIO>( new OpensslBIOWrapper( conn ) ) );
 
-    try {
-        DefaultRecordHandler* dh = new DefaultRecordHandler( std::shared_ptr<Signer>( new SimpleOpensslSigner( profiles[5] ) ), slip1 );
+    DefaultRecordHandler* dh = new DefaultRecordHandler( std::shared_ptr<Signer>( new SimpleOpensslSigner( ) ), slip1 );
 
-        while( true ) {
+    logger::note( "Entering mainloop" );
+    while( true ) {
+        try {
             dh->handle();
+            //} catch( const std::exception &ch ) {
+            //std::cout << "Real exception: " << typeid(ch).name() << ", " << ch.what() << std::endl;
+        } catch( const std::string& ch ) {
+            logger::error( "Exception: ", ch );
+        } catch( char const* ch ) {
+            logger::error( "Exception: ", ch );
         }
-    } catch( char const* ch ) {
-        std::cout << "Exception: " << ch << std::endl;
     }
 
     return -1;
+
+} catch( std::exception& e ) {
+    logger::fatalf( "Fatal Error: %s!\n", e.what() );
+    return -1;
+} catch( ... ) {
+    logger::fatal( "Fatal Error: Unknown Exception!\n" );
+    return -1;
 }