From cbeab6f9b01132a02a5f97fed8caf1971501fa9a Mon Sep 17 00:00:00 2001 From: Ricardo Ianelli Date: Sun, 10 Feb 2013 02:28:47 -0200 Subject: [PATCH] Moving start messages to lua Moved start log messages to lua, to make easier to enable/disable those messages. --- init.lua | 6 +++--- modules/client/client.lua | 9 ++++++++- src/framework/core/application.cpp | 1 - src/framework/core/logger.cpp | 2 -- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index 76251382..72e8dbdf 100644 --- a/init.lua +++ b/init.lua @@ -3,13 +3,14 @@ -- setup logger g_logger.setLogFile(g_resources.getWorkDir() .. g_app.getCompactName() .. ".log") +g_logger.info(os.date("== application started at %b %d %Y %X")) -- print first terminal message g_logger.info(g_app.getName() .. ' ' .. g_app.getVersion() .. ' rev ' .. g_app.getBuildRevision() .. ' (' .. g_app.getBuildCommit() .. ') built on ' .. g_app.getBuildDate() .. ' for arch ' .. g_app.getBuildArch()) -- add data directory to the search path if not g_resources.addSearchPath(g_resources.getWorkDir() .. "data", true) then - g_logger.fatal("Unable to add data directory to the search path.") + g_logger.fatal("Unable to add data directory to the search path.") end -- add modules directory to the search path @@ -50,5 +51,4 @@ g_modules.autoLoadModules(9999) local script = '/' .. g_app.getCompactName() .. 'rc' if g_resources.fileExists(script) then dofile(script) -end - +end \ No newline at end of file diff --git a/modules/client/client.lua b/modules/client/client.lua index 835f322c..0a6d93cc 100644 --- a/modules/client/client.lua +++ b/modules/client/client.lua @@ -93,7 +93,10 @@ function init() g_configs.save() end - connect(g_app, { onRun = startup }) + connect(g_app, { + onRun = startup, + onClose = exit, + }) end function terminate() @@ -107,3 +110,7 @@ function terminate() g_settings.set('protocol-version', protocolVersion) end end + +function exit() + g_logger.info("Exiting application..") +end \ No newline at end of file diff --git a/src/framework/core/application.cpp b/src/framework/core/application.cpp index eb17ce96..8e5d7684 100644 --- a/src/framework/core/application.cpp +++ b/src/framework/core/application.cpp @@ -153,7 +153,6 @@ void Application::poll() void Application::exit() { m_stopping = true; - g_logger.info("Exiting application.."); } void Application::close() diff --git a/src/framework/core/logger.cpp b/src/framework/core/logger.cpp index 3aa5d60c..d015ed1d 100644 --- a/src/framework/core/logger.cpp +++ b/src/framework/core/logger.cpp @@ -129,7 +129,5 @@ void Logger::setLogFile(const std::string& file) g_logger.error(stdext::format("Unable to save log to '%s'", file)); return; } - - m_outFile << "\n== application started at " << stdext::date_time_string() << std::endl; m_outFile.flush(); }