projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increase aggressiveness of the compress filter.
[paraslash.git]
/
server.c
diff --git
a/server.c
b/server.c
index 98e208ac39d9212d67491faf0ad69e21af785128..90dfc1f58962f69355775fd87e4c08f8253efeac 100644
(file)
--- a/
server.c
+++ b/
server.c
@@
-205,7
+205,7
@@
static void shm_init(void)
mmd->sender_cmd_data.cmd_num = -1;
return;
err_out:
mmd->sender_cmd_data.cmd_num = -1;
return;
err_out:
- PARA_EMERG_LOG("%s", para_strerror(-ret));
+ PARA_EMERG_LOG("%s
\n
", para_strerror(-ret));
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
@@
-263,12
+263,6
@@
static void parse_config(int override)
server_cmdline_parser_config_file(cf, &conf, ¶ms);
conf.daemon_given = tmp;
}
server_cmdline_parser_config_file(cf, &conf, ¶ms);
conf.daemon_given = tmp;
}
- /* logfile */
- if (!conf.logfile_given && conf.daemon_given) {
- ret = -1;
- PARA_EMERG_LOG("fatal: daemon option, but no log file given\n");
- goto out;
- }
if (conf.logfile_given)
logfile = open_log(conf.logfile_arg);
ret = 1;
if (conf.logfile_given)
logfile = open_log(conf.logfile_arg);
ret = 1;
@@
-421,7
+415,7
@@
static unsigned server_init(int argc, char **argv)
*/
static void handle_sighup(void)
{
*/
static void handle_sighup(void)
{
- PARA_NOTICE_LOG("
%s", "
SIGHUP\n");
+ PARA_NOTICE_LOG("SIGHUP\n");
close_log(logfile); /* gets reopened if necessary by parse_config */
logfile = NULL;
parse_config(1); /* reopens log */
close_log(logfile); /* gets reopened if necessary by parse_config */
logfile = NULL;
parse_config(1); /* reopens log */
@@
-554,7
+548,7
@@
genocide:
random();
chld_pid = fork();
if (chld_pid < 0) {
random();
chld_pid = fork();
if (chld_pid < 0) {
- PARA_CRIT_LOG("
%s", "
fork failed\n");
+ PARA_CRIT_LOG("fork failed\n");
goto repeat;
}
if (chld_pid) {
goto repeat;
}
if (chld_pid) {