chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logging: Move "starting" message earlier
[secnet.git]
/
secnet.c
diff --git
a/secnet.c
b/secnet.c
index 8fb8affe43f80d6cebab337e504524b7f3907756..2ebcddc1ae94491bbf5ad90edb1f12e3a84049dd 100644
(file)
--- a/
secnet.c
+++ b/
secnet.c
@@
-4,7
+4,7
@@
*
* secnet is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
*
* secnet is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version
d
of the License, or
+ * the Free Software Foundation; either version
3
of the License, or
* (at your option) any later version.
*
* secnet is distributed in the hope that it will be useful, but
* (at your option) any later version.
*
* secnet is distributed in the hope that it will be useful, but
@@
-127,6
+127,9
@@
static void parse_options(int argc, char **argv)
exit(0);
break;
exit(0);
break;
+ case 'd':
+ message_level|=M_DEBUG_CONFIG|M_DEBUG_PHASE|M_DEBUG;
+ /* fall through */
case 'v':
message_level|=M_INFO|M_NOTICE|M_WARNING|M_ERR|M_SECURITY|
M_FATAL;
case 'v':
message_level|=M_INFO|M_NOTICE|M_WARNING|M_ERR|M_SECURITY|
M_FATAL;
@@
-136,10
+139,6
@@
static void parse_options(int argc, char **argv)
message_level&=(~M_WARNING);
break;
message_level&=(~M_WARNING);
break;
- case 'd':
- message_level|=M_DEBUG_CONFIG|M_DEBUG_PHASE|M_DEBUG;
- break;
-
case 'f':
message_level=M_FATAL;
break;
case 'f':
message_level=M_FATAL;
break;
@@
-188,11
+187,9
@@
static void parse_options(int argc, char **argv)
static void setup(dict_t *config)
{
list_t *l;
static void setup(dict_t *config)
{
list_t *l;
- item_t *site;
dict_t *system;
struct passwd *pw;
struct cloc loc;
dict_t *system;
struct passwd *pw;
struct cloc loc;
- int i;
l=dict_lookup(config,"system");
l=dict_lookup(config,"system");
@@
-227,6
+224,12
@@
static void setup(dict_t *config)
"that secnet retain root privileges while running.",
require_root_privileges_explanation);
}
"that secnet retain root privileges while running.",
require_root_privileges_explanation);
}
+}
+
+static void start_sites(dict_t *config) {
+ int i;
+ list_t *l;
+ item_t *site;
/* Go along site list, starting sites */
l=dict_lookup(config,sites_key);
/* Go along site list, starting sites */
l=dict_lookup(config,sites_key);
@@
-244,7
+247,7
@@
static void setup(dict_t *config)
cfgfatal(site->loc,"system","non-site closure in site list");
}
s=site->data.closure->interface;
cfgfatal(site->loc,"system","non-site closure in site list");
}
s=site->data.closure->interface;
- s->
control(s->st,True
);
+ s->
startup(s->st
);
}
}
}
}
}
}
@@
-326,8
+329,6
@@
static void run(void)
struct pollfd *fds=0;
int allocdfds=0, shortfall=0;
struct pollfd *fds=0;
int allocdfds=0, shortfall=0;
- Message(M_NOTICE,"%s [%d]: starting\n",version,secnet_pid);
-
do {
if (gettimeofday(&tv_now_global, NULL)!=0) {
fatal_perror("main loop: gettimeofday");
do {
if (gettimeofday(&tv_now_global, NULL)!=0) {
fatal_perror("main loop: gettimeofday");
@@
-494,6
+495,7
@@
int main(int argc, char **argv)
{
dict_t *config;
{
dict_t *config;
+ log_early_init();
phase_hooks_init();
enter_phase(PHASE_GETOPTS);
phase_hooks_init();
enter_phase(PHASE_GETOPTS);
@@
-504,6
+506,7
@@
int main(int argc, char **argv)
enter_phase(PHASE_SETUP);
setup(config);
enter_phase(PHASE_SETUP);
setup(config);
+ start_sites(config);
if (just_check_config) {
Message(M_INFO,"configuration file check complete\n");
if (just_check_config) {
Message(M_INFO,"configuration file check complete\n");
@@
-512,6
+515,7
@@
int main(int argc, char **argv)
enter_phase(PHASE_DAEMONIZE);
become_daemon();
enter_phase(PHASE_DAEMONIZE);
become_daemon();
+ Message(M_NOTICE,"%s [%d]: starting\n",version,secnet_pid);
enter_phase(PHASE_GETRESOURCES);
/* Appropriate phase hooks will have been run */
enter_phase(PHASE_GETRESOURCES);
/* Appropriate phase hooks will have been run */