SILO-GROUP
/
rex
1
0
Fork 0
Code Issues 2 Pull Requests Releases 4 Activity

cleaned up some logging

master
Christopher M. Punches 2021-07-26 01:52:12 -04:00
parent 23f64c026c
commit a85721a0e9
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Sproc/Sproc.cpp
View File

@ -233,13 +233,14 @@ int Sproc::execute(std::string shell, std::string environment_file, std::string
std::string sourcer = ". " + environment_file + " && " + command; std::string sourcer = ". " + environment_file + " && " + command;
// Show the user a debug print of what is going to be executed in the shell. // Show the user a debug print of what is going to be executed in the shell.
slog.log(E_DEBUG, "[ '" + task_name + "' ] Shell call for loading: ``" + sourcer + "``."); slog.log(E_INFO, "[ '" + task_name + "' ] Shell call for loading: ``" + sourcer + "``.");
// file descriptors for parent/child i/o // file descriptors for parent/child i/o
int child_stdout_pipe[2]; int child_stdout_pipe[2];
int child_stderr_pipe[2]; int child_stderr_pipe[2];
slog.log( E_DEBUG, "[ '" + task_name + "' ] STDIN/STDOUT/STDERR file descriptors created." ); // no longer really needed, but may be handy for more verbosity settings later
//slog.log( E_DEBUG, "[ '" + task_name + "' ] STDIN/STDOUT/STDERR file descriptors created." );
// man 3 pipe // man 3 pipe
if (pipe(child_stdout_pipe) == -1 ) { if (pipe(child_stdout_pipe) == -1 ) {
@ -279,7 +280,7 @@ int Sproc::execute(std::string shell, std::string environment_file, std::string
// fork a process // fork a process
pid_t pid = fork(); pid_t pid = fork();
slog.log( E_DEBUG, "[ '" + task_name + "' ] Process forked. Reporting. (PID: " + std::to_string(pid) + ")" ); //slog.log( E_DEBUG, "[ '" + task_name + "' ] Process forked. Reporting. (PID: " + std::to_string(pid) + ")" );
switch ( pid ) { switch ( pid ) {
case FORK_STATES::FORK_FAILURE: case FORK_STATES::FORK_FAILURE:
@ -304,7 +305,7 @@ int Sproc::execute(std::string shell, std::string environment_file, std::string
close( child_stderr_pipe[READ_END] ); close( child_stderr_pipe[READ_END] );
slog.log(E_INFO, "[ '" + task_name + "' ] TEE Logging enabled."); slog.log(E_INFO, "[ '" + task_name + "' ] TEE Logging enabled.");
slog.log(E_DEBUG, "[ '" + task_name + "' ] DUP2: child_*_pipe[1]->STD*_FILENO"); //slog.log(E_DEBUG, "[ '" + task_name + "' ] DUP2: child_*_pipe[1]->STD*_FILENO");
// set identity context // set identity context
// set gid and uid // set gid and uid

3
test/plans/atomic.plan
View File

@ -1,5 +1,6 @@
{ {
"plan": [ "plan": [
{ "name": "independent test 1", "dependencies": [ null ] } { "name": "independent test 1", "dependencies": [ null ] },
{ "name": "independent test 2", "dependencies": [ null ] }
] ]
} }

2
test/units/all_test.units
View File

@ -23,7 +23,7 @@
"user": "bagira", "user": "bagira",
"group": "bagira", "group": "bagira",
"rectify": false, "rectify": false,
"shell": "/usr/bin/env bash", "shell": "/usr/bin/bash",
"environment": "environments/rex.variables" "environment": "environments/rex.variables"
}, },
{ {