X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fconfiguration%2Fapplication_configuration.cpp;h=9f01391f8c61ebd1fdab010d5a0f7655c409941f;hb=4b0fd7e660f5e88fa897edd224c16a69f6018d07;hp=3b70e55344fa928fd7e7eb9b50829a4b800a6d06;hpb=bffe9fba70b7ea1ab1b5d963b811d4637b021ee1;p=feisty_meow.git diff --git a/nucleus/library/configuration/application_configuration.cpp b/nucleus/library/configuration/application_configuration.cpp index 3b70e553..9f01391f 100644 --- a/nucleus/library/configuration/application_configuration.cpp +++ b/nucleus/library/configuration/application_configuration.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -91,7 +92,7 @@ astring application_configuration::get_cmdline_from_proc() // command line are all separated by zero characters. __check_once_app_path = filebuff; delete [] filebuff; -printf("got an app name before chewing: %s\n", __check_once_app_path.s()); +//printf("got an app name before chewing: %s\n", __check_once_app_path.s()); // clean out quote characters from the name. for (int i = __check_once_app_path.length() - 1; i >= 0; i--) { if (__check_once_app_path[i] == '"') __check_once_app_path.zap(i, i); @@ -101,7 +102,7 @@ printf("got an app name before chewing: %s\n", __check_once_app_path.s()); filename testing(__check_once_app_path); if (testing.had_directory()) return __check_once_app_path; // all set. -printf("no dir part found, app name after chewing: %s\n", __check_once_app_path.s()); +//printf("no dir part found, app name after chewing: %s\n", __check_once_app_path.s()); //hmmm: the below might be better off as a find app in path method, which relies on which. // there was no directory component, so we'll try to guess one. @@ -136,7 +137,7 @@ printf("no dir part found, app name after chewing: %s\n", __check_once_app_path. // deprecated; better to use the /proc/pid/cmdline file. astring application_configuration::query_for_process_info() { -// FUNCDEF("query_for_process_info"); + FUNCDEF("query_for_process_info"); astring to_return = "unknown"; // we ask the operating system about our process identifier and store // the results in a temporary file. @@ -197,7 +198,7 @@ astring application_configuration::query_for_process_info() astring application_configuration::application_name() { -// FUNCDEF("application_name"); + FUNCDEF("application_name"); astring to_return; #ifdef __APPLE__ char buffer[MAX_ABS_PATH] = { '\0' }; @@ -310,7 +311,7 @@ astring application_configuration::get_logging_directory() // get the entry for the logging path. if (!log_dir) { // if the entry was absent, we set it. -printf("did not find log dir in config file\n"); +//printf("did not find log dir in config file\n"); ini_configurator ini(application_configuration_file(), ini_configurator::RETURN_ONLY, ini_configurator::APPLICATION_DIRECTORY); @@ -319,26 +320,25 @@ printf("did not find log dir in config file\n"); // they gave us something. let's replace the environment variables // in their string so we resolve paths and such. log_dir = parser_bits::substitute_env_vars(log_dir); -printf("%s", (char *)a_sprintf("got log dir with %s value\n", log_dir.s()).s()); +//printf("%s", (char *)a_sprintf("got log dir with %s value\n", log_dir.s()).s()); } // now we make sure the directory exists. - struct stat to_fill; - int stat_ret = stat(log_dir.observe(), &to_fill); - if (stat_ret || !(to_fill.st_mode & S_IFDIR) ) { - // if it's not anything yet or if it's not a directory, then we need - // to create it. -//if it's something besides a directory... should it be deleted? + filename testing(log_dir); + if (!testing.exists()) { + bool okay = directory::recursive_create(log_dir); + if (!okay) { + LOG(astring("failed to create logging directory: ") + log_dir); + // return a directory almost guaranteed to exist; best we can do in this case. #ifdef __UNIX__ - int mk_ret = mkdir(log_dir.s(), 0777); + return "/tmp"; #endif #ifdef __WIN32__ - int mk_ret = mkdir(log_dir.s()); + return "c:/"; #endif - if (mk_ret) return ""; -//can't have a log file if we can't make the directory successfully??? + } } - + return log_dir; }