aiden
/
appmotor
mirror of https://github.com/cutefishos/appmotor
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changes: rename logNotice to logDebug, use logDebug instead of logInfo

Browse Source 
RevBy: TrustMe
pull/1/head
Alexey Shilov 15 years ago
parent deb480881f
commit 194646aaea
7 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File

6
src/launcherlib/booster.cpp
Unescape Escape View File

@ -87,7 +87,7 @@ void Booster::initialize(int initialArgc, char ** initialArgv, int newPipeFd[2],
popPriority();
// Wait and read commands from the invoker
Logger::logNotice("Booster: Wait for message from invoker");
Logger::logDebug("Booster: Wait for message from invoker");
if (!receiveDataFromInvoker(socketFd)) {
Logger::logErrorAndDie(EXIT_FAILURE, "Booster: Couldn't read command\n");
}
@ -202,7 +202,7 @@ void Booster::run(SocketManager * socketManager)
}
// Execute the binary
Logger::logInfo("Booster: invoking '%s' ", m_appData->fileName().c_str());
Logger::logDebug("Booster: invoking '%s' ", m_appData->fileName().c_str());
int ret_val = launchProcess();
// Send exit status to invoker, if needed
@ -324,7 +324,7 @@ int Booster::launchProcess()
const char * pwd = getenv("PWD");
if (pwd) chdir(pwd);
Logger::logNotice("Booster: launching process: '%s' ", m_appData->fileName().c_str());
Logger::logDebug("Booster: launching process: '%s' ", m_appData->fileName().c_str());
Logger::closeLog();
// Jump to main()

10
src/launcherlib/connection.cpp
Unescape Escape View File

@ -122,7 +122,7 @@ bool Connection::sendMsg(uint32_t msg)
{
if (!m_testMode)
{
Logger::logInfo("%s: %08x", __FUNCTION__, msg);
Logger::logDebug("Connection: %s: %08x", __FUNCTION__, msg);
return write(m_fd, &msg, sizeof(msg)) != -1;
}
else
@ -146,7 +146,7 @@ bool Connection::recvMsg(uint32_t *msg)
}
else
{
Logger::logInfo("%s: %08x", __FUNCTION__, *msg);
Logger::logDebug("Connection: %s: %08x", __FUNCTION__, *msg);
*msg = buf;
}
@ -166,7 +166,7 @@ bool Connection::sendStr(const char * str)
uint32_t size = strlen(str) + 1;
sendMsg(size);
Logger::logInfo("Connection: %s: '%s'", __FUNCTION__, str);
Logger::logDebug("Connection: %s: '%s'", __FUNCTION__, str);
// Send the string.
return write(m_fd, str, size) != -1;
@ -209,7 +209,7 @@ const char * Connection::recvStr()
}
str[size - 1] = '\0';
Logger::logInfo("%s: '%s'", __FUNCTION__, str);
Logger::logDebug("Connection: %s: '%s'", __FUNCTION__, str);
return str;
}
@ -457,7 +457,7 @@ bool Connection::receiveIO()
bool Connection::receiveActions()
{
Logger::logInfo("Connection: enter: %s", __FUNCTION__);
Logger::logDebug("Connection: enter: %s", __FUNCTION__);
while (1)
{

20
src/launcherlib/daemon.cpp
Unescape Escape View File

@ -134,7 +134,7 @@ void Daemon::initBoosterSockets()
BoosterPluginEntry * plugin = BoosterPluginRegistry::pluginEntry(i);
if (plugin)
{
Logger::logInfo("Daemon: initing socket: %s", plugin->socketNameFunc());
Logger::logDebug("Daemon: initing socket: %s", plugin->socketNameFunc());
m_socketManager->initSocket(plugin->socketNameFunc());
}
}
@ -148,7 +148,7 @@ void Daemon::forkBoosters()
BoosterPluginEntry * plugin = BoosterPluginRegistry::pluginEntry(i);
if (plugin)
{
Logger::logInfo("Daemon: forking booster: '%c'", plugin->type);
Logger::logDebug("Daemon: forking booster: '%c'", plugin->type);
forkBooster(plugin->type);
}
}
@ -197,7 +197,7 @@ void Daemon::run()
}
else
{
Logger::logInfo("Daemon: invoker's pid: %d \n", invokerPid);
Logger::logDebug("Daemon: invoker's pid: %d \n", invokerPid);
}
if (invokerPid != 0)
@ -220,7 +220,7 @@ void Daemon::run()
}
else
{
Logger::logInfo("Daemon: respawn delay: %d \n", delay);
Logger::logDebug("Daemon: respawn delay: %d \n", delay);
}
// Fork a new booster of the given type
@ -260,7 +260,7 @@ void Daemon::loadSingleInstancePlugin()
{
if (m_singleInstance->validateAndRegisterPlugin(handle))
{
Logger::logInfo("Daemon: single-instance plugin loaded.'");
Logger::logDebug("Daemon: single-instance plugin loaded.'");
}
else
{
@ -303,7 +303,7 @@ void Daemon::loadBoosterPlugins()
char newType = BoosterPluginRegistry::validateAndRegisterPlugin(handle);
if (newType)
{
Logger::logInfo("Daemon: Booster of type '%c' loaded.'", newType);
Logger::logDebug("Daemon: Booster of type '%c' loaded.'", newType);
}
else
{
@ -354,7 +354,7 @@ void Daemon::forkBooster(char type, int sleepTime)
if (sleepTime)
sleep(sleepTime);
Logger::logInfo("Daemon: Running a new Booster of type '%c'", type);
Logger::logDebug("Daemon: Running a new Booster of type '%c'", type);
// Create a new booster, initialize and run it
Booster * booster = BoosterFactory::create(type);
@ -411,15 +411,15 @@ void Daemon::reapZombies()
PidMap::iterator it = m_boosterPidToInvokerPid.find(pid);
if (it != m_boosterPidToInvokerPid.end())
{
Logger::logInfo("Daemon: Terminated process had a mapping to an invoker pid");
Logger::logDebug("Daemon: Terminated process had a mapping to an invoker pid");
if (WIFSIGNALED(status))
{
int signal = WTERMSIG(status);
pid_t invokerPid = (*it).second;
Logger::logInfo("Daemon: Booster (pid=%d) was terminated due to signal %d\n", pid, signal);
Logger::logInfo("Daemon: Killing invoker process (pid=%d) by signal %d..\n", invokerPid, signal);
Logger::logDebug("Daemon: Booster (pid=%d) was terminated due to signal %d\n", pid, signal);
Logger::logDebug("Daemon: Killing invoker process (pid=%d) by signal %d..\n", invokerPid, signal);
if (kill(invokerPid, signal) != 0)
{

12
src/launcherlib/logger.cpp
Unescape Escape View File

@ -154,8 +154,8 @@ void Logger::writeLog(const int priority, const char * format, va_list ap)
// Print type prefix to the stream
switch (priority)
{
case LOG_NOTICE:
m_logStream << " [NOTICE] ";
case LOG_DEBUG:
m_logStream << " [DEBUG] ";
break;
case LOG_ERR:
@ -183,12 +183,12 @@ void Logger::writeLog(const int priority, const char * format, va_list ap)
}
void Logger::logNotice(const char * format, ...)
void Logger::logDebug(const char * format, ...)
{
#ifndef DEBUG_LOGGING_DISABLED
va_list(ap);
va_start(ap, format);
writeLog(LOG_NOTICE, format, ap);
writeLog(LOG_DEBUG, format, ap);
va_end(ap);
#else
Q_UNUSED(format);
@ -197,14 +197,10 @@ void Logger::logNotice(const char * format, ...)
void Logger::logInfo(const char * format, ...)
{
#ifndef DEBUG_LOGGING_DISABLED
va_list(ap);
va_start(ap, format);
writeLog(LOG_INFO, format, ap);
va_end(ap);
#else
Q_UNUSED(format);
#endif
}
void Logger::logWarning(const char * format, ...)

2
src/launcherlib/logger.h
Unescape Escape View File

@ -52,7 +52,7 @@ public:
* sequence of additional arguments, each containing one value to be inserted
* in the format parameter, if any.
*/
static void logNotice(const char * format, ...);
static void logDebug(const char * format, ...);
/*!

2
src/launcherlib/main.cpp
Unescape Escape View File

@ -48,7 +48,7 @@ Q_DECL_EXPORT int main(int argc, char * argv[])
// Open the log
Logger::openLog(PROG_NAME_LAUNCHER);
Logger::logNotice("%s starting..", PROG_NAME_LAUNCHER);
Logger::logDebug("%s starting..", PROG_NAME_LAUNCHER);
// Check that an instance of launcher is not already running
if(!Daemon::lock())

2
src/launcherlib/socketmanager.cpp
Unescape Escape View File

@ -31,7 +31,7 @@ void SocketManager::initSocket(const string & socketId)
// exist for that id / path.
if (m_socketHash.find(socketId) == m_socketHash.end())
{
Logger::logInfo("Initing socket at '%s'..", socketId.c_str());
Logger::logDebug("SoketManager: Initing socket at '%s'..", socketId.c_str());
// Create a new local socket
int socketFd = socket(PF_UNIX, SOCK_STREAM, 0);

Write Preview
Loading…
Cancel
Save