projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b58ff2b
)
* vCtdlLogPrintf() one more try
author
Wilfried Göesgens
<willi@citadel.org>
Sun, 20 Jun 2010 22:28:31 +0000
(22:28 +0000)
committer
Wilfried Göesgens
<willi@citadel.org>
Sun, 20 Jun 2010 22:28:31 +0000
(22:28 +0000)
citadel/server_main.c
patch
|
blob
|
history
diff --git
a/citadel/server_main.c
b/citadel/server_main.c
index 9a425a0fb907a4dee1cafe3d7105e859a799073b..b44cd09966e41e6070976ca6e360dad7e2a55844 100644
(file)
--- a/
citadel/server_main.c
+++ b/
citadel/server_main.c
@@
-106,6
+106,7
@@
int main(int argc, char **argv)
int relh=0;
int home=0;
int dbg=0;
int relh=0;
int home=0;
int dbg=0;
+ int have_log=0;
int have_minus_x=0;
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
int have_minus_x=0;
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
@@
-143,8
+144,6
@@
int main(int argc, char **argv)
/* run in the background if -d was specified */
else if (!strcmp(argv[a], "-d")) {
running_as_daemon = 1;
/* run in the background if -d was specified */
else if (!strcmp(argv[a], "-d")) {
running_as_daemon = 1;
- if (!have_minus_x)
- print_to_logfile = 0;
}
/* run a few stats if -s was specified */
}
/* run a few stats if -s was specified */
@@
-156,7
+155,6
@@
int main(int argc, char **argv)
else if (!strncmp(argv[a], "-x", 2)) {
verbosity = atoi(&argv[a][2]);
have_minus_x = 1;
else if (!strncmp(argv[a], "-x", 2)) {
verbosity = atoi(&argv[a][2]);
have_minus_x = 1;
- print_to_logfile = 1;
}
else if (!strncmp(argv[a], "-h", 2)) {
}
else if (!strncmp(argv[a], "-h", 2)) {
@@
-178,6
+176,7
@@
int main(int argc, char **argv)
strerror(errno));
exit(1);
}
strerror(errno));
exit(1);
}
+ have_log = 1;
}
else if (!strncmp(argv[a], "-D", 2)) {
}
else if (!strncmp(argv[a], "-D", 2)) {
@@
-203,6
+202,9
@@
int main(int argc, char **argv)
}
}
+ if (have_minus_x && running_as_daemon && have_log)
+ print_to_logfile = 1;
+
calc_dirs_n_files(relh, home, relhome, ctdldir, dbg);
/* daemonize, if we were asked to */
if (running_as_daemon) {
calc_dirs_n_files(relh, home, relhome, ctdldir, dbg);
/* daemonize, if we were asked to */
if (running_as_daemon) {