Merge pull request #267 from ricardoianelli/master

Rework on init/exit log messages.
This commit is contained in:
Henrique Santiago 2013-02-08 21:03:08 -08:00
commit 25841e9c77
4 changed files with 13 additions and 8 deletions

View File

@ -3,6 +3,7 @@
-- setup logger -- setup logger
g_logger.setLogFile(g_resources.getWorkDir() .. g_app.getCompactName() .. ".log") 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 -- 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()) 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())
@ -48,7 +49,7 @@ g_modules.ensureModuleLoaded("game_interface")
g_modules.autoLoadModules(9999) g_modules.autoLoadModules(9999)
local script = '/' .. g_app.getCompactName() .. 'rc' local script = '/' .. g_app.getCompactName() .. 'rc'
if g_resources.fileExists(script) then if g_resources.fileExists(script) then
dofile(script) dofile(script)
end end

View File

@ -53,6 +53,9 @@ function startup()
end end
function init() function init()
connect(g_app, { onRun = startup,
onClose = exit })
g_window.setMinimumSize({ width = 600, height = 480 }) g_window.setMinimumSize({ width = 600, height = 480 })
g_sounds.preload(musicFilename) g_sounds.preload(musicFilename)
@ -92,11 +95,11 @@ function init()
g_configs.set('uuid', g_crypt.getMachineUUID()) g_configs.set('uuid', g_crypt.getMachineUUID())
g_configs.save() g_configs.save()
end end
connect(g_app, { onRun = startup })
end end
function terminate() function terminate()
disconnect(g_app, { onRun = startup,
onClose = exit })
-- save window configs -- save window configs
g_settings.set('window-size', g_window.getUnmaximizedSize()) g_settings.set('window-size', g_window.getUnmaximizedSize())
g_settings.set('window-pos', g_window.getUnmaximizedPos()) g_settings.set('window-pos', g_window.getUnmaximizedPos())
@ -107,3 +110,7 @@ function terminate()
g_settings.set('protocol-version', protocolVersion) g_settings.set('protocol-version', protocolVersion)
end end
end end
function exit()
g_logger.info("Exiting application..")
end

View File

@ -153,7 +153,6 @@ void Application::poll()
void Application::exit() void Application::exit()
{ {
m_stopping = true; m_stopping = true;
g_logger.info("Exiting application..");
} }
void Application::close() void Application::close()

View File

@ -129,7 +129,5 @@ void Logger::setLogFile(const std::string& file)
g_logger.error(stdext::format("Unable to save log to '%s'", file)); g_logger.error(stdext::format("Unable to save log to '%s'", file));
return; return;
} }
m_outFile << "\n== application started at " << stdext::date_time_string() << std::endl;
m_outFile.flush(); m_outFile.flush();
} }