1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
--- src/rtgpoll.c.orig 2003-09-25 15:56:04 UTC
+++ src/rtgpoll.c
@@ -13,6 +13,7 @@
stats_t stats =
{PTHREAD_MUTEX_INITIALIZER, 0, 0, 0, 0, 0, 0, 0, 0, 0.0};
char *target_file = NULL;
+char *pidfile = NULL;
target_t *current = NULL;
MYSQL mysql;
int entries = 0;
@@ -41,7 +42,7 @@ int main(int argc, char *argv[]) {
config_defaults(&set);
/* Parse the command-line. */
- while ((ch = getopt(argc, argv, "c:dhmt:vz")) != EOF)
+ while ((ch = getopt(argc, argv, "c:dhmp:t:vz")) != EOF)
switch ((char) ch) {
case 'c':
conf_file = optarg;
@@ -55,6 +56,9 @@ int main(int argc, char *argv[]) {
case 'm':
set.multiple++;
break;
+ case 'p':
+ pidfile = optarg;
+ break;
case 't':
target_file = optarg;
break;
@@ -66,6 +70,9 @@ int main(int argc, char *argv[]) {
break;
}
+ if (!pidfile)
+ pidfile = DEFAULT_PIDFILE;
+
if (set.verbose >= LOW)
printf("RTG version %s starting.\n", VERSION);
@@ -78,7 +85,7 @@ int main(int argc, char *argv[]) {
sigaddset(&signal_set, SIGINT);
sigaddset(&signal_set, SIGQUIT);
if (!set.multiple)
- checkPID(PIDFILE);
+ checkPID(pidfile);
if (pthread_sigmask(SIG_BLOCK, &signal_set, NULL) != 0)
printf("pthread_sigmask error\n");
@@ -244,7 +251,7 @@ void *sig_handler(void *arg)
if (set.verbose >= LOW)
printf("Quiting: received signal %d.\n", sig_number);
rtg_dbdisconnect(&mysql);
- unlink(PIDFILE);
+ unlink(pidfile);
exit(1);
break;
}
@@ -259,6 +266,7 @@ void usage(char *prog)
printf("\nOptions:\n");
printf(" -c <file> Specify configuration file\n");
printf(" -d Disable database inserts\n");
+ printf(" -p <file> Specify pid file (defaults to /tmp/rtgpoll.pid)\n");
printf(" -t <file> Specify target file\n");
printf(" -v Increase verbosity\n");
printf(" -m Allow multiple instances\n");
|
