Start and log daemon activity only if requested.

This commit is contained in:
Frederic Culot 2009-08-01 17:53:11 +00:00
parent 989b6c885f
commit 55d6703fad
3 changed files with 12 additions and 5 deletions

View File

@ -10,6 +10,10 @@
* src/custom (custom_load_conf): restore daemon configuration * src/custom (custom_load_conf): restore daemon configuration
options options
* src/utils.c (exit_calcurse): start daemon only if requested
* src/dmon.c (DMON_LOG): log daemon activity only if requested
2009-07-29 Frederic Culot <frederic@culot.org> 2009-07-29 Frederic Culot <frederic@culot.org>

View File

@ -1,4 +1,4 @@
/* $calcurse: dmon.c,v 1.9 2009/08/01 13:31:20 culot Exp $ */ /* $calcurse: dmon.c,v 1.10 2009/08/01 17:53:11 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -56,7 +56,8 @@
#define DMON_SLEEP_TIME 60 #define DMON_SLEEP_TIME 60
#define DMON_LOG(...) do { \ #define DMON_LOG(...) do { \
(void)io_fprintln (path_dmon_log, __VA_ARGS__); \ if (dmon.log) \
(void)io_fprintln (path_dmon_log, __VA_ARGS__); \
} while (0) } while (0)
#define DMON_ABRT(...) do { \ #define DMON_ABRT(...) do { \
@ -181,7 +182,8 @@ dmon_start (int parent_exit_status)
recur_apoint_llist_init (); recur_apoint_llist_init ();
io_load_app (); io_load_app ();
data_loaded = 1; data_loaded = 1;
DMON_LOG (_("started at %s\n"), nowstr ());
for (;;) for (;;)
{ {
int left; int left;

View File

@ -1,4 +1,4 @@
/* $calcurse: utils.c,v 1.81 2009/07/27 19:35:09 culot Exp $ */ /* $calcurse: utils.c,v 1.82 2009/08/01 17:53:11 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -88,7 +88,8 @@ exit_calcurse (int status)
if (unlink (path_cpid) != 0) if (unlink (path_cpid) != 0)
EXIT (_("Could not remove calcurse lock file: %s\n"), EXIT (_("Could not remove calcurse lock file: %s\n"),
strerror (errno)); strerror (errno));
dmon_start (status); if (dmon.enable)
dmon_start (status);
} }
exit (status); exit (status);