Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added debug log level setting
  • Loading branch information
kwolekr committed Feb 22, 2013
1 parent c19fc00 commit 7f240ae
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/defaultsettings.cpp
Expand Up @@ -183,7 +183,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("congestion_control_max_rate", "400");
settings->setDefault("congestion_control_min_rate", "10");
settings->setDefault("remote_media", "");

settings->setDefault("debug_log_level", "0");
// physics stuff
settings->setDefault("movement_acceleration_default", "3");
settings->setDefault("movement_acceleration_air", "2");
Expand Down
40 changes: 25 additions & 15 deletions src/main.cpp
Expand Up @@ -887,22 +887,7 @@ int main(int argc, char *argv[])
fs::CreateDir(porting::path_user);

init_gettext((porting::path_share + DIR_DELIM + "locale").c_str());

// Initialize debug streams
#define DEBUGFILE "debug.txt"
#if RUN_IN_PLACE
std::string logfile = DEBUGFILE;
#else
std::string logfile = porting::path_user+DIR_DELIM+DEBUGFILE;
#endif
if(cmd_args.exists("logfile"))
logfile = cmd_args.get("logfile");
if(logfile != "")
debugstreams_init(false, logfile.c_str());
else
debugstreams_init(false, NULL);

infostream<<"logfile = "<<logfile<<std::endl;
infostream<<"path_share = "<<porting::path_share<<std::endl;
infostream<<"path_user = "<<porting::path_user<<std::endl;

Expand Down Expand Up @@ -995,6 +980,31 @@ int main(int argc, char *argv[])
if(configpath == "")
configpath = filenames[0];
}

// Initialize debug streams
#define DEBUGFILE "debug.txt"
#if RUN_IN_PLACE
std::string logfile = DEBUGFILE;
#else
std::string logfile = porting::path_user+DIR_DELIM+DEBUGFILE;
#endif
if(cmd_args.exists("logfile"))
logfile = cmd_args.get("logfile");

log_remove_output(&main_dstream_no_stderr_log_out);
int loglevel = g_settings->getS32("debug_log_level");

if (loglevel == 0) //no logging
logfile = "";
else if (loglevel > 0 && loglevel <= LMT_NUM_VALUES)
log_add_output_maxlev(&main_dstream_no_stderr_log_out, (LogMessageLevel)(loglevel - 1));

if(logfile != "")
debugstreams_init(false, logfile.c_str());
else
debugstreams_init(false, NULL);

infostream<<"logfile = "<<logfile<<std::endl;

// Initialize random seed
srand(time(0));
Expand Down

0 comments on commit 7f240ae

Please sign in to comment.