change to postgres with libpqxx

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

diff --git a/src/apps/client.cpp b/src/apps/client.cpp
index 36488f5627ee4435f7c0f9dcf45b19bd7190ee41..71d41dbd2ccf98e3e6d17ed7b152dac69a44e793 100644 (file)
--- a/src/apps/client.cpp
+++ b/src/apps/client.cpp
@@ -7,7 +7,7 @@
 #include <unordered_map>
 
 #include "db/database.h"
-#include "db/mysql.h"
+#include "db/psql.h"
 #include "crypto/simpleOpensslSigner.h"
 #include "crypto/remoteSigner.h"
 #include "crypto/sslUtil.h"
@@ -53,10 +53,14 @@ void checkCRLs( std::shared_ptr<Signer> sign ) {
 
 int main( int argc, const char* argv[] ) {
     bool once = false;
+    bool resetOnly = false;
 
     if( argc == 2 && std::string( "--once" ) == argv[1] ) {
         once = true;
     }
+    if( argc == 2 && std::string( "--reset" ) == argv[1] ) {
+        resetOnly = true;
+    }
 
     std::string path;
 
@@ -75,14 +79,20 @@ int main( int argc, const char* argv[] ) {
         logger::fatal( "Error: no serial device is given!" );
         return -1;
     }
-
-    std::shared_ptr<JobProvider> jp = std::make_shared<MySQLJobProvider>( sqlHost, sqlUser, sqlPass, sqlDB );
+    std::shared_ptr<JobProvider> jp = std::make_shared<PostgresJobProvider>( sqlHost, sqlUser, sqlPass, sqlDB );
     std::shared_ptr<BIO> b = openSerial( serialPath );
     std::shared_ptr<BIO> slip1( BIO_new( toBio<SlipBIO>() ), BIO_free );
-    static_cast<SlipBIO*>( slip1->ptr )->setTarget( std::make_shared<OpensslBIOWrapper>( b ) );
+    static_cast<SlipBIO*>( slip1->ptr )->setTarget( std::make_shared<OpensslBIOWrapper>( b ), false );
     auto sign = std::make_shared<RemoteSigner>( slip1, generateSSLContext( false ) );
     // std::shared_ptr<Signer> sign( new SimpleOpensslSigner() );
 
+    if( resetOnly ) {
+        std::cout << "Doing BIO reset" << std::endl;
+        int result = BIO_reset( slip1.get() );
+        std::cout << "Did BIO reset, result " << result << ", exiting." << std::endl;
+        return result;
+    }
+
     time_t lastCRLCheck = 0;
 
     while( true ) {