ticker: fix cfparser conversion

Agile copy-paste hurts.

Also mention heap-impl and base for libusual,
to get proper header dependencies.

diff --git a/sql/ticker/Makefile b/sql/ticker/Makefile
index dade2d29866c18434a6d649e5535e695e652d6a7..d05699c93ecc630ba71638e6d5d2c645338309c8 100644 (file)
--- a/sql/ticker/Makefile
+++ b/sql/ticker/Makefile
@@ -3,8 +3,8 @@ include ../../config.mak
 
 USUAL_DIR = ../../lib
 USUAL_OBJDIR = .
-USUAL_MODULES = logging daemon event string time \
-               cfparser fileutil socket compat
+USUAL_MODULES = logging daemon event string time cfparser fileutil \
+               socket compat heap-impl base
 include $(USUAL_DIR)/Setup.mk
 
 PROGRAM = pgqd

diff --git a/sql/ticker/pgqd.c b/sql/ticker/pgqd.c
index 9f065c40138677d3b4ee1c231ef98e48082440f1..051016b8694703f55a3e2f1b57ad0cfec8334c1a 100644 (file)
--- a/sql/ticker/pgqd.c
+++ b/sql/ticker/pgqd.c
@@ -33,12 +33,12 @@ static const struct CfKey conf_params[] = {
        { "pidfile", CF_REL_STR(pidfile) },
        { "initial_database", CF_REL_STR(initial_database), "template1" },
        { "base_connstr", CF_REL_STR(base_connstr), "" },
-       { "database_list", CF_REL_STR(base_connstr) },
+       { "database_list", CF_REL_STR(database_list) },
        { "syslog", CF_REL_INT(syslog) },
        { "check_period", CF_REL_TIME_DOUBLE(check_period), "60" },
-       { "maint_period", CF_REL_TIME_DOUBLE(check_period), "120" },
-       { "retry_period", CF_REL_TIME_DOUBLE(check_period), "30" },
-       { "ticker_period", CF_REL_TIME_DOUBLE(check_period), "1" },
+       { "maint_period", CF_REL_TIME_DOUBLE(maint_period), "120" },
+       { "retry_period", CF_REL_TIME_DOUBLE(retry_period), "30" },
+       { "ticker_period", CF_REL_TIME_DOUBLE(ticker_period), "1" },
        { NULL },
 };