Skip to content

Commit

Permalink
fix remaining logger invokes
Browse files Browse the repository at this point in the history
  • Loading branch information
@muskanlalit18
muskanlalit18 committed Nov 20, 2024
1 parent 249c433 commit 95cea2b
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 32 deletions.
2 changes: 1 addition & 1 deletion api/src/gmsa_service.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ class CredentialsFetcherImpl final
}
else
{
log_message = "gMSA ticket is at " + gmsa_ticket_result.second.c_str();
log_message = "gMSA ticket is at " + gmsa_ticket_result.second;
cf_logger.logger( LOG_INFO, log_message.c_str() );
std::cerr << Util::getCurrentTime() << '\t'
<< "INFO: gMSA ticket is at " << gmsa_ticket_result.second
Expand Down
3 changes: 2 additions & 1 deletion auth/kerberos/src/krb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ std::pair<int, std::string> generate_krb_ticket_from_machine_keytab( std::string
result = Util::is_decode_exe_present();
if ( result.first != 0 )
{
cf_logger.logger( LOG_ERR, result.second.c_str() ) return result;
cf_logger.logger( LOG_ERR, result.second.c_str() );
return result;
}

/**
Expand Down
2 changes: 0 additions & 2 deletions common/daemon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ class CF_logger

void write_log( const char* message )
{

printf("format string: %s", format);
const int max_log_len = 10 * 1024 * 1024; // 10 MB

int fd = open( "/var/credentials-fetcher/logging/credentials-fetcher.log", O_RDWR );
Expand Down
51 changes: 33 additions & 18 deletions daemon/src/daemon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ int main( int argc, const char* argv[] )

std::string log_msg = "Credentials-fetcher daemon has started running";
std::cerr << log_msg << std::endl;
cf_daemon.cf_logger.logger( LOG_ERR, "%s", log_msg.c_str() );
cf_daemon.cf_logger.logger( LOG_ERR, log_msg.c_str() );
std::cerr << "on request failures check logs located at " + cf_daemon.logging_dir << std::endl;
;

Expand All @@ -198,8 +198,9 @@ int main( int argc, const char* argv[] )
{
std::cerr << "Failed parsing environment variable " << getenv( ENV_CF_CRED_SPEC_FILE )
<< std::endl;
cf_daemon.cf_logger.logger( LOG_ERR, "Failed parsing environment variable %s",
getenv( ENV_CF_CRED_SPEC_FILE ) );
std::string log_message = "Failed parsing environment variable " +
std::string( getenv( ENV_CF_CRED_SPEC_FILE ) );
cf_daemon.cf_logger.logger( LOG_ERR, log_message.c_str() );

exit( EXIT_FAILURE );
}
Expand Down Expand Up @@ -249,11 +250,11 @@ int main( int argc, const char* argv[] )
// 1. Systemd - daemon
// 2. grpc server
// 3. timer to run every 45 min

std::string log_message;
if ( !cf_daemon.cred_file.empty() )
{
cf_daemon.cf_logger.logger( LOG_INFO, "Credential file exists %s",
cf_daemon.cred_file.c_str() );
log_message = "Credential file exists " + cf_daemon.cred_file;
cf_daemon.cf_logger.logger( LOG_INFO, log_message.c_str() );

int specFileReturn = ProcessCredSpecFile( cf_daemon.krb_files_dir, cf_daemon.cred_file,
cf_daemon.cf_logger, cred_file_lease_id );
Expand All @@ -268,30 +269,44 @@ int main( int argc, const char* argv[] )
pthread_status = create_pthread( grpc_thread_start, grpc_thread_name, -1 );
if ( pthread_status.first < 0 )
{
cf_daemon.cf_logger.logger( LOG_ERR, "Error %d: Cannot create pthreads",
std::to_string( pthread_status.first ).c_str() );
log_message =
"Error " + std::to_string( pthread_status.first ) + ": Cannot create pthreads";
cf_daemon.cf_logger.logger( LOG_ERR, log_message.c_str() );
exit( EXIT_FAILURE );
}
grpc_pthread = pthread_status.second;
cf_daemon.cf_logger.logger( LOG_INFO, "grpc pthread is at %p",
grpc_pthread == nullptr
? "Warning: grpc_pthread is null"
: static_cast<const char*>( grpc_pthread ) );
if ( grpc_pthread == nullptr )
{
log_message = "Warning: grpc_pthread is null";
}
else
{
log_message =
"grpc pthread is at " + std::string( static_cast<const char*>( grpc_pthread ) );
}
cf_daemon.cf_logger.logger( LOG_INFO, log_message.c_str() );

/* Create pthread for refreshing krb tickets */
pthread_status =
create_pthread( refresh_krb_tickets_thread_start, "krb_ticket_refresh_thread", -1 );
if ( pthread_status.first < 0 )
{
cf_daemon.cf_logger.logger( LOG_ERR, "Error %d: Cannot create pthreads",
std::to_string( pthread_status.first ).c_str() );
log_message =
"Error " + std::to_string( pthread_status.first ) + ": Cannot create pthreads";
cf_daemon.cf_logger.logger( LOG_ERR, log_message.c_str() );
exit( EXIT_FAILURE );
}
krb_refresh_pthread = pthread_status.second;
cf_daemon.cf_logger.logger( LOG_INFO, "krb refresh pthread is at %p",
grpc_pthread == nullptr
? "Warning: krb_refresh_pthread is null"
: static_cast<const char*>( krb_refresh_pthread ) );
if ( krb_refresh_pthread == nullptr )
{
log_message = "Warning: krb_refresh_pthread is null";
}
else
{
log_message = "krb refresh pthread is at " +
std::string( static_cast<const char*>( krb_refresh_pthread ) );
}
cf_daemon.cf_logger.logger( LOG_INFO, log_message.c_str() );

cf_daemon.cf_logger.set_log_level( LOG_NOTICE );

Expand Down
21 changes: 11 additions & 10 deletions renewal/src/renewal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ int krb_ticket_renew_handler( Daemon cf_daemon )
{
std::list<krb_ticket_info_t*> krb_ticket_info_list =
read_meta_data_json( file_path );
std::string log_message;

// refresh the kerberos tickets for the service accounts, if tickets ready for
// renewal
Expand All @@ -69,9 +70,9 @@ int krb_ticket_renew_handler( Daemon cf_daemon )
if ( gmsa_ticket_result.first != 0 )
{
std::pair<int, std::string> status;
cf_logger.logger(
LOG_ERR, "ERROR: Cannot get gMSA krb ticket using account %s",
krb_ticket->service_account_name.c_str() );
log_message = "ERROR: Cannot get gMSA krb ticket using account " +
krb_ticket->service_account_name;
cf_logger.logger( LOG_ERR, log_message.c_str() );
if ( domainless_user.find( "awsdomainlessusersecret" ) !=
std::string::npos )
{
Expand All @@ -87,10 +88,9 @@ int krb_ticket_renew_handler( Daemon cf_daemon )
}
if ( status.first < 0 )
{
cf_logger.logger(
LOG_ERR, "Error %d: Cannot get machine krb ticket",
( std::to_string( status.first ) + " " + status.second )
.c_str() );
log_message = "Error " + std::to_string( status.first ) +
": Cannot get machine krb ticket";
cf_logger.logger( LOG_ERR, log_message.c_str() );
}
else
{
Expand All @@ -101,19 +101,20 @@ int krb_ticket_renew_handler( Daemon cf_daemon )
}
else
{
cf_logger.logger( LOG_INFO, "gMSA ticket is at %s", krb_cc_name.c_str() );
log_message = "gMSA ticket is at " + krb_cc_name;
cf_logger.logger( LOG_INFO, log_message.c_str() );
}
}
}
}
catch ( const std::exception& ex )
{
std::string log_str = Util::getCurrentTime() + '\t' + "ERROR: '" + ex.what() + "'!\n";
cf_logger.logger( LOG_ERR, log_str.c_str(), "" );
cf_logger.logger( LOG_ERR, log_str.c_str() );
std::cerr << log_str << std::endl;
log_str = Util::getCurrentTime() + '\t' + "ERROR: failed to run ticket renewal";
std::cerr << log_str << std::endl;
cf_logger.logger( LOG_ERR, log_str.c_str(), "" );
cf_logger.logger( LOG_ERR, log_str.c_str() );
break;
}
}
Expand Down

0 comments on commit 95cea2b

Please sign in to comment.