X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fapps%2Fclient.cpp;h=80422b3bc0e13046ee40dee913a5e7f3648b7aa3;hb=HEAD;hp=aa0e06c2a882e8b1f14d61d4677c9f36932f7e9e;hpb=9c55265516730ab819180848f2bd7a0fd27a3d79;p=cassiopeia.git

diff --git a/src/apps/client.cpp b/src/apps/client.cpp
index aa0e06c..80422b3 100644
--- a/src/apps/client.cpp
+++ b/src/apps/client.cpp
@@ -36,10 +36,7 @@ void checkCRLs( std::shared_ptr<Signer> sign ) {
     logger::note( "Signing CRLs" );
 
     for( auto& x : CAs ) {
-        logger::notef( "Checking: %s ...", x.first );
-
         if( !x.second->crlNeedsResign() ) {
-            logger::warnf( "Skipping Resigning CRL: %s ...", x.second->name );
             continue;
         }
 
@@ -216,12 +213,10 @@ int main( int argc, const char *argv[] ) {
                 continue;
             }
 
-            std::shared_ptr<std::ofstream> logPtr = openLogfile( std::string( "logs/" ) + job->id + std::string( "_" ) + job->warning + std::string( ".log" ) );
-
-            logger::logger_set log_set( {logger::log_target( *logPtr, logger::level::debug )}, logger::auto_register::on );
+            logger::logger_set log_set( {logger::log_target( job->log, logger::level::debug )}, logger::auto_register::on );
 
             logger::note( "TASK ID: ", job->id );
-            logger::note( "TRY:     ", job->warning );
+            logger::note( "TRY:     ", job->attempt );
             logger::note( "TARGET:  ", job->target );
             logger::note( "TASK:    ", job->task );
 
@@ -248,8 +243,6 @@ int main( int argc, const char *argv[] ) {
                         logger::notef( "INFO: AVA %s: %s", AVA->name, AVA->value );
                     }
 
-                    logger::notef( "FINE: Found the CSR at '%s'", cert->csr );
-                    cert->csr_content = readFile( keyDir + "/../" + cert->csr );
                     logger::note( "FINE: CSR content:\n", cert->csr_content );
 
                     std::shared_ptr<SignedCertificate> res = sign->sign( cert );
@@ -263,30 +256,14 @@ int main( int argc, const char *argv[] ) {
                     logger::note( "FINE: CERTIFICATE LOG:\n", res->log,
                                   "FINE: CERTIFICATE:\n", res->certificate );
 
-                    std::string fn = writeBackFile( job->target.c_str(), res->certificate, keyDir );
-
-                    if( fn.empty() ) {
-                        logger::error( "ERROR: Writeback of the certificate failed." );
-                        jp->failJob( job );
-                        continue;
-                    }
-
-                    res->crt_name = fn;
                     jp->writeBack( job, res ); //! \FIXME: Check return value
                     logger::note( "FINE: signing done." );
 
                     if( DAEMON ) {
                         jp->finishJob( job );
                     }
-
-                    continue;
                 } catch( std::exception& c ) {
-                    logger::error( "ERROR: ", c.what() );
-                }
-
-                try {
                     jp->failJob( job );
-                } catch( std::exception& c ) {
                     logger::error( "ERROR: ", c.what() );
                 }
             } else if( job->task == "revoke" ) {
@@ -303,7 +280,9 @@ int main( int argc, const char *argv[] ) {
 
                     jp->writeBackRevocation( job, timeToString( time ) );
                     jp->finishJob( job );
+                    continue;
                 } catch( const std::exception& c ) {
+                    jp->failJob( job );
                     logger::error( "Exception: ", c.what() );
                 }
             } else {