static const char *sitename, *remote_host;
static const char *feedfile, *path_run, *path_cli, *path_cli_dir;
static int quiet_multiple=0;
-static int become_daemon=1, try_filemon=1;
+static int interactive=0, try_filemon=1;
static int try_stream=1;
static int port=119;
static const char *inndconffile;
static int max_connections=10;
static int max_queue_per_conn=200;
static int target_max_feedfile_size=100000;
-static int period_seconds=60;
+static int period_seconds=30;
static int filepoll_seconds=5;
static int max_queue_per_ipf=-1;
static void logcore(int sysloglevel, const char *fmt, ...) PRINTF(2,3);
static void logcore(int sysloglevel, const char *fmt, ...) {
VA;
- if (become_daemon) {
+ if (interactive < 2) {
vsyslog(sysloglevel,fmt,al);
} else {
if (self_pid) fprintf(stderr,"[%lu] ",(unsigned long)self_pid);
fprintf(stderr, "bad usage: %s\n"
"say --help for help, or read the manpage\n",
m);
- if (become_daemon)
+ if (interactive < 2)
syslog(LOG_CRIT,"innduct: invoked with bad usage: %s",m);
exit(8);
}
static const Option innduct_options[]= {
{'f',"feedfile", "F", &feedfile, op_string },
{'q',"quiet-multiple", 0, &quiet_multiple, op_setint, 1 },
-{0,"no-daemon", 0, &become_daemon, op_setint, 0 },
+{0,"no-daemon", 0, &interactive, op_setint, 1 },
+{0,"interactive", 0, &interactive, op_setint, 2 },
{0,"no-streaming", 0, &try_stream, op_setint, 0 },
{0,"no-filemon", 0, &try_filemon, op_setint, 0 },
{'C',"inndconf", "F", &inndconffile, op_string },
LIST_INIT(conns);
- if (become_daemon) {
+ if (interactive < 1) {
int i;
for (i=3; i<255; i++)
/* do this now before we open syslog, etc. */
close(i);
+ }
+
+ if (interactive < 2)
openlog("innduct",LOG_NDELAY|LOG_PID,LOG_NEWS);
+ if (interactive < 1) {
int null= open("/dev/null",O_RDWR);
if (null<0) sysfatal("failed to open /dev/null");
dup2(null,0);
r= SMsetup(SM_PREOPEN, &val); if (!r) warn("SMsetup SM_PREOPEN failed");
r= SMinit(); if (!r) die("storage manager initialisation (SMinit) failed");
- if (!become_daemon)
+ if (interactive >= 2)
cli_stdio();
cli_init();