From b907ade842310cd5a8c15c3aaddf219f2326398c Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 12 Aug 2013 16:24:10 +0200 Subject: [PATCH] Removed some verbosity from procs library. --- lib/procs.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/procs.cpp b/lib/procs.cpp index f7942272..4be1230b 100644 --- a/lib/procs.cpp +++ b/lib/procs.cpp @@ -112,7 +112,7 @@ void Util::Procs::childsig_handler(int signum){ std::string pname = plist[ret]; #endif plist.erase(ret); -#if DEBUG >= 1 +#if DEBUG >= 5 if (isActive(pname)){ Stop(pname); } else{ @@ -124,7 +124,7 @@ void Util::Procs::childsig_handler(int signum){ if (exitHandlers.count(ret) > 0){ TerminationNotifier tn = exitHandlers[ret]; exitHandlers.erase(ret); -#if DEBUG >= 2 +#if DEBUG >= 5 std::cerr << "Calling termination handler for " << pname << std::endl; #endif tn(ret, exitcode); @@ -209,7 +209,7 @@ pid_t Util::Procs::Start(std::string name, std::string cmd){ runCmd(cmd); }else{ if (ret > 0){ -#if DEBUG >= 1 +#if DEBUG >= 5 std::cerr << "Process " << name << " started, PID " << ret << ": " << cmd << std::endl; #endif plist.insert(std::pair(ret, name)); @@ -273,7 +273,7 @@ pid_t Util::Procs::Start(std::string name, std::string cmd, std::string cmd2){ runCmd(cmd2); }else{ if (ret2 > 0){ -#if DEBUG >= 1 +#if DEBUG >= 5 std::cerr << "Process " << name << " started, PIDs (" << ret << ", " << ret2 << "): " << cmd << " | " << cmd2 << std::endl; #endif plist.insert(std::pair(ret2, name)); @@ -356,7 +356,7 @@ pid_t Util::Procs::Start(std::string name, std::string cmd, std::string cmd2, st runCmd(cmd2); }else{ if (ret2 > 0){ -#if DEBUG >= 1 +#if DEBUG >= 5 std::cerr << "Process " << name << " started, PIDs (" << ret << ", " << ret2 << "): " << cmd << " | " << cmd2 << std::endl; #endif plist.insert(std::pair(ret2, name)); @@ -387,7 +387,7 @@ pid_t Util::Procs::Start(std::string name, std::string cmd, std::string cmd2, st runCmd(cmd3); }else{ if (ret3 > 0){ -#if DEBUG >= 1 +#if DEBUG >= 5 std::cerr << "Process " << name << " started, PIDs (" << ret << ", " << ret2 << ", " << ret3 << "): " << cmd << " | " << cmd2 << " | " << cmd3 << std::endl; #endif plist.insert(std::pair(ret3, name)); @@ -416,6 +416,9 @@ pid_t Util::Procs::Start(std::string name, std::string cmd, std::string cmd2, st /// \arg fdout Same as fdin, but for stderr. pid_t Util::Procs::StartPiped(std::string name, char * argv[], int * fdin, int * fdout, int * fderr){ if (isActive(name)){ + #if DEBUG >= 1 + std::cerr << name << " already active - skipping start" << std::endl; + #endif return getPid(name); } pid_t pid; @@ -534,7 +537,7 @@ pid_t Util::Procs::StartPiped(std::string name, char * argv[], int * fdin, int * } return 0; }else{ //parent -#if DEBUG >= 1 +#if DEBUG >= 5 std::cerr << "Piped process " << name << " started"; if (fdin ) std::cerr << " in=" << (*fdin == -1 ? pipein [1] : *fdin ); if (fdout) std::cerr << " out=" << (*fdout == -1 ? pipeout[0] : *fdout);