Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 20:11:11 +00:00
Code Issues Releases Activity

Simplify exception handling and get rid of conky::critical_error

Browse Source 
As i said in my rant somewhere, it's up to the person catching the exception to decide if the
error is critical or not. The person throwing the exception should specify the type of error and
that's where his job ends.
This commit is contained in:
Pavel Labath 2010-11-21 22:44:04 +01:00
parent 5c49c52a0b
commit 5a7ec7fb0b
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/conky.cc
View File

@ -2657,20 +2657,21 @@ void load_config_file()
} }
#ifdef BUILD_OLD_CONFIG #ifdef BUILD_OLD_CONFIG
catch(lua::syntax_error &e) { catch(lua::syntax_error &e) {
NORM_ERR("Syntax error (%s) while reading config file. "
"Assuming it's in old syntax and attempting conversion.", e.what());
// the strchr thingy skips the first line (#! /usr/bin/lua) // the strchr thingy skips the first line (#! /usr/bin/lua)
l.loadstring(strchr(convertconf, '\n')); l.loadstring(strchr(convertconf, '\n'));
l.pushstring(current_config.c_str()); l.pushstring(current_config.c_str());
l.call(1, 1); l.call(1, 1);
} }
#endif #endif
catch(lua::file_error &e) { throw conky::critical_error(_("no configfile given")); }
l.call(0, 0); l.call(0, 0);
l.getglobal("conky"); l.getglobal("conky");
l.getfield(-1, "text"); l.getfield(-1, "text");
l.replace(-2); l.replace(-2);
if(l.type(-1) != lua::TSTRING) if(l.type(-1) != lua::TSTRING)
throw conky::critical_error(_("missing text block in configuration")); throw conky::error(_("missing text block in configuration"));
/* Remove \\-\n. */ /* Remove \\-\n. */
l.gsub(l.tocstring(-1), "\\\n", ""); l.gsub(l.tocstring(-1), "\\\n", "");
@ -2815,7 +2816,7 @@ void set_current_config() {
current_config = builtin_config_magic; current_config = builtin_config_magic;
NORM_ERR(NOCFGFILEFOUND ", using builtin default"); NORM_ERR(NOCFGFILEFOUND ", using builtin default");
#else #else
throw conky::critical_error(NOCFGFILEFOUND); throw conky::error(NOCFGFILEFOUND);
#endif #endif
} }
@ -3094,10 +3095,6 @@ int main(int argc, char **argv)
main_loop(); main_loop();
} }
catch(conky::critical_error &e) {
std::cerr << "caught critical exception: " << e.what() << std::endl;
return EXIT_FAILURE;
}
catch(fork_throw &e) { return EXIT_SUCCESS; } catch(fork_throw &e) { return EXIT_SUCCESS; }
catch(unknown_arg_throw &e) { return EXIT_FAILURE; } catch(unknown_arg_throw &e) { return EXIT_FAILURE; }
catch(obj_create_error &e) { catch(obj_create_error &e) {
@ -3105,8 +3102,8 @@ int main(int argc, char **argv)
clean_up(NULL, NULL); clean_up(NULL, NULL);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
catch(std::bad_alloc &e) { catch(std::exception &e) {
std::cerr << e.what() << std::endl; std::cerr << PACKAGE_NAME": " << e.what() << std::endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

7
src/logging.h
View File

@ -90,13 +90,6 @@ namespace conky {
: std::runtime_error(msg) : std::runtime_error(msg)
{} {}
}; };
class critical_error: public error {
public:
critical_error(const std::string &msg)
: error(msg)
{}
};
} }
/* debugging output */ /* debugging output */