Wed Jun 27 09:20:26 PDT 2007
- Previous message: [Slony1-commit] slony1-engine RELEASE-2.0
- Next message: [Slony1-commit] slony1-engine/doc/adminguide loganalysis.sgml slon.sgml slonconf.sgml slonik_ref.sgml
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /home/cvsd/slony1/slony1-engine/src/slon
In directory main.slony.info:/tmp/cvs-serv9493
Modified Files:
confoptions.c dbutils.c local_listen.c remote_listen.c
remote_worker.c slon.c sync_thread.c
Log Message:
Revisions to logging levels
- Changed config items to SLON_CONFIG
- Other interesting messages are at SLON_INFO
- Goal: Should usually be able to run with debugging level = 0 (= INFO)
and still get all the interesting information
Index: dbutils.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/dbutils.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** dbutils.c 25 Jun 2007 16:34:57 -0000 1.27
--- dbutils.c 27 Jun 2007 16:20:24 -0000 1.28
***************
*** 124,128 ****
}
! slon_log(SLON_DEBUG4,
"version for \"%s\" is %d\n", conninfo, conn->pg_version);
--- 124,128 ----
}
! slon_log(SLON_CONFIG,
"version for \"%s\" is %d\n", conninfo, conn->pg_version);
Index: remote_listen.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_listen.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** remote_listen.c 20 Apr 2007 20:53:18 -0000 1.35
--- remote_listen.c 27 Jun 2007 16:20:24 -0000 1.36
***************
*** 97,101 ****
PollState oldpstate;
! slon_log(SLON_DEBUG1,
"remoteListenThread_%d: thread starts\n",
node->no_id);
--- 97,101 ----
PollState oldpstate;
! slon_log(SLON_INFO,
"remoteListenThread_%d: thread starts\n",
node->no_id);
***************
*** 136,140 ****
strcmp(conn_conninfo, node->pa_conninfo) != 0)
{
! slon_log(SLON_DEBUG1,
"remoteListenThread_%d: "
"disconnecting from '%s'\n",
--- 136,140 ----
strcmp(conn_conninfo, node->pa_conninfo) != 0)
{
! slon_log(SLON_CONFIG,
"remoteListenThread_%d: "
"disconnecting from '%s'\n",
Index: local_listen.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/local_listen.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** local_listen.c 20 Apr 2007 20:53:18 -0000 1.41
--- local_listen.c 27 Jun 2007 16:20:24 -0000 1.42
***************
*** 49,53 ****
int poll_sleep = 0;
! slon_log(SLON_DEBUG1, "localListenThread: thread starts\n");
/*
--- 49,53 ----
int poll_sleep = 0;
! slon_log(SLON_INFO, "localListenThread: thread starts\n");
/*
***************
*** 626,630 ****
* Nothing to do locally
*/
! slon_log(SLON_DEBUG2, "localListenThread: ACCEPT_SET");
rtcfg_reloadListen(dbconn);
}
--- 626,630 ----
* Nothing to do locally
*/
! slon_log(SLON_DEBUG1, "localListenThread: ACCEPT_SET");
rtcfg_reloadListen(dbconn);
}
***************
*** 700,704 ****
#endif
! slon_log(SLON_DEBUG1, "localListenThread: thread done\n");
pthread_exit(NULL);
}
--- 700,704 ----
#endif
! slon_log(SLON_INFO, "localListenThread: thread done\n");
pthread_exit(NULL);
}
Index: sync_thread.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/sync_thread.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** sync_thread.c 14 Mar 2007 15:59:32 -0000 1.19
--- sync_thread.c 27 Jun 2007 16:20:24 -0000 1.20
***************
*** 53,57 ****
bool first_time = TRUE;
! slon_log(SLON_DEBUG1,
"syncThread: thread starts\n");
--- 53,57 ----
bool first_time = TRUE;
! slon_log(SLON_INFO,
"syncThread: thread starts\n");
***************
*** 195,199 ****
slon_disconnectdb(conn);
! slon_log(SLON_DEBUG1, "syncThread: thread done\n");
pthread_exit(NULL);
}
--- 195,199 ----
slon_disconnectdb(conn);
! slon_log(SLON_INFO, "syncThread: thread done\n");
pthread_exit(NULL);
}
Index: remote_worker.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** remote_worker.c 19 Jun 2007 19:14:49 -0000 1.145
--- remote_worker.c 27 Jun 2007 16:20:24 -0000 1.146
***************
*** 292,296 ****
bool need_reloadListen = false;
! slon_log(SLON_DEBUG1,
"remoteWorkerThread_%d: thread starts\n",
node->no_id);
--- 292,296 ----
bool need_reloadListen = false;
! slon_log(SLON_INFO,
"remoteWorkerThread_%d: thread starts\n",
node->no_id);
***************
*** 986,990 ****
PGresult *res;
! slon_log(SLON_DEBUG2, "start processing ACCEPT_SET\n");
set_id = (int)strtol(event->ev_data1, NULL, 10);
slon_log(SLON_DEBUG2, "ACCEPT: set=%d\n", set_id);
--- 986,990 ----
PGresult *res;
! slon_log(SLON_DEBUG1, "start processing ACCEPT_SET\n");
set_id = (int)strtol(event->ev_data1, NULL, 10);
slon_log(SLON_DEBUG2, "ACCEPT: set=%d\n", set_id);
***************
*** 1009,1013 ****
if ((rtcfg_nodeid != old_origin) && (rtcfg_nodeid != new_origin))
{
! slon_log(SLON_DEBUG2, "ACCEPT_SET - node not origin\n");
(void) slon_mkquery(&query2,
"select 1 from %s.sl_event "
--- 1009,1013 ----
if ((rtcfg_nodeid != old_origin) && (rtcfg_nodeid != new_origin))
{
! slon_log(SLON_DEBUG1, "ACCEPT_SET - node not origin\n");
(void) slon_mkquery(&query2,
"select 1 from %s.sl_event "
***************
*** 1034,1038 ****
while (PQntuples(res) == 0)
{
! slon_log(SLON_DEBUG2, "ACCEPT_SET - MOVE_SET or FAILOVER_SET not received yet - sleep\n");
if (sched_msleep(node, 10000) != SCHED_STATUS_OK)
slon_retry();
--- 1034,1038 ----
while (PQntuples(res) == 0)
{
! slon_log(SLON_DEBUG1, "ACCEPT_SET - MOVE_SET or FAILOVER_SET not received yet - sleep\n");
if (sched_msleep(node, 10000) != SCHED_STATUS_OK)
slon_retry();
***************
*** 1041,1045 ****
}
PQclear(res);
! slon_log(SLON_DEBUG2, "ACCEPT_SET - MOVE_SET or FAILOVER_SET exists - adjusting setsync status\n");
/*
--- 1041,1045 ----
}
PQclear(res);
! slon_log(SLON_DEBUG1, "ACCEPT_SET - MOVE_SET or FAILOVER_SET exists - adjusting setsync status\n");
/*
***************
*** 1073,1077 ****
slon_appendquery(&query1, "commit transaction;");
query_execute(node, local_dbconn, &query1);
! slon_log(SLON_DEBUG2, "ACCEPT_SET - done\n");
archive_close(node);
slon_retry();
--- 1073,1077 ----
slon_appendquery(&query1, "commit transaction;");
query_execute(node, local_dbconn, &query1);
! slon_log(SLON_DEBUG1, "ACCEPT_SET - done\n");
archive_close(node);
slon_retry();
***************
*** 1081,1085 ****
else
{
! slon_log(SLON_DEBUG2, "ACCEPT_SET - on origin node...\n");
}
--- 1081,1085 ----
else
{
! slon_log(SLON_DEBUG1, "ACCEPT_SET - on origin node...\n");
}
***************
*** 1471,1475 ****
free(wd);
! slon_log(SLON_DEBUG1,
"remoteWorkerThread_%d: thread done\n",
node->no_id);
--- 1471,1475 ----
free(wd);
! slon_log(SLON_INFO,
"remoteWorkerThread_%d: thread done\n",
node->no_id);
***************
*** 1492,1496 ****
int i;
! slon_log(SLON_DEBUG4, "remoteWorkerThread_%d: "
"update provider configuration\n",
node->no_id);
--- 1492,1496 ----
int i;
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"update provider configuration\n",
node->no_id);
***************
*** 1585,1589 ****
slon_retry();
}
! slon_log(SLON_DEBUG1, "remoteWorkerThread_%d: "
"helper thread for provider %d created\n",
node->no_id, provider->no_id);
--- 1585,1589 ----
slon_retry();
}
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"helper thread for provider %d created\n",
node->no_id, provider->no_id);
***************
*** 1637,1641 ****
provider->set_tail, pset);
! slon_log(SLON_DEBUG4, "remoteWorkerThread_%d: "
"added active set %d to provider %d\n",
node->no_id, pset->set_id, provider->no_id);
--- 1637,1641 ----
provider->set_tail, pset);
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"added active set %d to provider %d\n",
node->no_id, pset->set_id, provider->no_id);
***************
*** 1672,1676 ****
pthread_mutex_destroy(&(provider->helper_lock));
! slon_log(SLON_DEBUG1, "remoteWorkerThread_%d: "
"helper thread for provider %d terminated\n",
node->no_id, provider->no_id);
--- 1672,1676 ----
pthread_mutex_destroy(&(provider->helper_lock));
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"helper thread for provider %d terminated\n",
node->no_id, provider->no_id);
***************
*** 1700,1704 ****
if (provider->conn != NULL)
{
! slon_log(SLON_DEBUG1, "remoteWorkerThread_%d: "
"disconnecting from data provider %d\n",
node->no_id, provider->no_id);
--- 1700,1704 ----
if (provider->conn != NULL)
{
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"disconnecting from data provider %d\n",
node->no_id, provider->no_id);
***************
*** 1733,1737 ****
if (provider->conn != NULL)
{
! slon_log(SLON_DEBUG1, "remoteWorkerThread_%d: "
"disconnecting from data provider %d\n",
node->no_id, provider->no_id);
--- 1733,1737 ----
if (provider->conn != NULL)
{
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"disconnecting from data provider %d\n",
node->no_id, provider->no_id);
***************
*** 1796,1800 ****
if (sched_get_status() != SCHED_STATUS_OK)
{
! slon_log(SLON_DEBUG2,
"remoteWorker_event: ignore new events due to shutdown\n");
return;
--- 1796,1800 ----
if (sched_get_status() != SCHED_STATUS_OK)
{
! slon_log(SLON_DEBUG1,
"remoteWorker_event: ignore new events due to shutdown\n");
return;
***************
*** 1980,1984 ****
{
rtcfg_unlock();
! slon_log(SLON_DEBUG2,
"remoteWorker_wakeup: unknown node %d\n",
no_id);
--- 1980,1984 ----
{
rtcfg_unlock();
! slon_log(SLON_DEBUG1,
"remoteWorker_wakeup: unknown node %d\n",
no_id);
***************
*** 2378,2382 ****
struct timeval tv_now;
! slon_log(SLON_DEBUG1, "copy_set %d\n", set_id);
gettimeofday(&tv_start, NULL);
--- 2378,2382 ----
struct timeval tv_now;
! slon_log(SLON_INFO, "copy_set %d\n", set_id);
gettimeofday(&tv_start, NULL);
***************
*** 2435,2439 ****
free(conninfo);
conninfo = NULL;
! slon_log(SLON_DEBUG1, "remoteWorkerThread_%d: "
"connected to provider DB\n",
node->no_id);
--- 2435,2439 ----
free(conninfo);
conninfo = NULL;
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"connected to provider DB\n",
node->no_id);
***************
*** 2590,2594 ****
gettimeofday(&tv_start2, NULL);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"prepare to copy table %s\n",
node->no_id, tab_fqname);
--- 2590,2594 ----
gettimeofday(&tv_start2, NULL);
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"prepare to copy table %s\n",
node->no_id, tab_fqname);
***************
*** 2634,2638 ****
PQclear(res1);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"all tables for set %d found on subscriber\n",
node->no_id, set_id);
--- 2634,2638 ----
PQclear(res1);
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"all tables for set %d found on subscriber\n",
node->no_id, set_id);
***************
*** 2679,2683 ****
char *seq_comment = PQgetvalue(res1, tupno1, 2);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"copy sequence %s\n",
node->no_id, seq_fqname);
--- 2679,2683 ----
char *seq_comment = PQgetvalue(res1, tupno1, 2);
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"copy sequence %s\n",
node->no_id, seq_fqname);
***************
*** 2752,2756 ****
gettimeofday(&tv_start2, NULL);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"copy table %s\n",
node->no_id, tab_fqname);
--- 2752,2756 ----
gettimeofday(&tv_start2, NULL);
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"copy table %s\n",
node->no_id, tab_fqname);
***************
*** 2828,2832 ****
* Begin a COPY from stdin for the table on the local DB
*/
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"Begin COPY of table %s\n",
node->no_id, tab_fqname);
--- 2828,2832 ----
* Begin a COPY from stdin for the table on the local DB
*/
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"Begin COPY of table %s\n",
node->no_id, tab_fqname);
***************
*** 3084,3088 ****
PQclear(res2);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
INT64_FORMAT " bytes copied for table %s\n",
node->no_id, copysize, tab_fqname);
--- 3084,3088 ----
PQclear(res2);
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
INT64_FORMAT " bytes copied for table %s\n",
node->no_id, copysize, tab_fqname);
***************
*** 3116,3120 ****
gettimeofday(&tv_now, NULL);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"%.3f seconds to copy table %s\n",
node->no_id,
--- 3116,3120 ----
gettimeofday(&tv_now, NULL);
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"%.3f seconds to copy table %s\n",
node->no_id,
***************
*** 3170,3174 ****
char *seq_fqname = PQgetvalue(res1, tupno1, 2);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"set last_value of sequence %s (%s) to %s\n",
node->no_id, seql_seqid, seq_fqname, seql_last_value);
--- 3170,3174 ----
char *seq_fqname = PQgetvalue(res1, tupno1, 2);
! slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
"set last_value of sequence %s (%s) to %s\n",
node->no_id, seql_seqid, seq_fqname, seql_last_value);
***************
*** 3221,3225 ****
{
gettimeofday(&tv_now, NULL);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"%.3f seconds to copy sequences\n",
node->no_id,
--- 3221,3225 ----
{
gettimeofday(&tv_now, NULL);
! slon_log(SLON_INFO, "remoteWorkerThread_%d: "
"%.3f seconds to copy sequences\n",
node->no_id,
***************
*** 3289,3293 ****
ssy_xip = event->ev_xip;
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"copy_set no previous SYNC found, use enable event.\n",
node->no_id);
--- 3289,3293 ----
ssy_xip = event->ev_xip;
! slon_log(SLON_INFO, "remoteWorkerThread_%d: "
"copy_set no previous SYNC found, use enable event.\n",
node->no_id);
***************
*** 3357,3361 ****
slon_appendquery(&query2, ")");
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"copy_set SYNC found, use event seqno %s.\n",
node->no_id, ssy_seqno);
--- 3357,3361 ----
slon_appendquery(&query2, ")");
! slon_log(SLON_INFO, "remoteWorkerThread_%d: "
"copy_set SYNC found, use event seqno %s.\n",
node->no_id, ssy_seqno);
***************
*** 3511,3515 ****
PQclear(res1);
gettimeofday(&tv_now, NULL);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"%.3f seconds to build initial setsync status\n",
node->no_id,
--- 3511,3515 ----
PQclear(res1);
gettimeofday(&tv_now, NULL);
! slon_log(SLON_INFO, "remoteWorkerThread_%d: "
"%.3f seconds to build initial setsync status\n",
node->no_id,
***************
*** 3544,3548 ****
gettimeofday(&tv_now, NULL);
! slon_log(SLON_DEBUG1, "copy_set %d done in %.3f seconds\n", set_id,
TIMEVAL_DIFF(&tv_start, &tv_now));
return 0;
--- 3544,3548 ----
gettimeofday(&tv_now, NULL);
! slon_log(SLON_INFO, "copy_set %d done in %.3f seconds\n", set_id,
TIMEVAL_DIFF(&tv_start, &tv_now));
return 0;
***************
*** 3714,3718 ****
return 10;
}
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"data provider %d confirmed up to "
"ev_seqno %s for ev_origin %d - OK\n",
--- 3714,3718 ----
return 10;
}
! slon_log(SLON_DEBUG1, "remoteWorkerThread_%d: "
"data provider %d confirmed up to "
"ev_seqno %s for ev_origin %d - OK\n",
***************
*** 3841,3845 ****
}
ntuples2 = PQntuples(res2);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"syncing set %d with %d table(s) from provider %d\n",
node->no_id, sub_set, ntuples2,
--- 3841,3845 ----
}
ntuples2 = PQntuples(res2);
! slon_log(SLON_INFO, "remoteWorkerThread_%d: "
"syncing set %d with %d table(s) from provider %d\n",
node->no_id, sub_set, ntuples2,
***************
*** 4015,4019 ****
if (num_sets == 0)
{
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: "
"no sets need syncing for this event\n",
node->no_id);
--- 4015,4019 ----
if (num_sets == 0)
{
! slon_log(SLON_DEBUG1, "remoteWorkerThread_%d: "
"no sets need syncing for this event\n",
node->no_id);
***************
*** 4259,4263 ****
}
! slon_log(SLON_DEBUG4, "remoteWorkerThread_%d: cleanup\n",
node->no_id);
--- 4259,4263 ----
}
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: cleanup\n",
node->no_id);
***************
*** 4426,4430 ****
char command[512];
sprintf(command, "%s %s", command_on_logarchive, node->archive_name);
! slon_log(SLON_INFO, "remoteWorkerThread_%d: Run Archive Command %s\n",
node->no_id, command);
system(command);
--- 4426,4430 ----
char command[512];
sprintf(command, "%s %s", command_on_logarchive, node->archive_name);
! slon_log(SLON_DEBUG1, "remoteWorkerThread_%d: Run Archive Command %s\n",
node->no_id, command);
system(command);
***************
*** 4438,4442 ****
dstring_free(&lsquery);
gettimeofday(&tv_now, NULL);
! slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: SYNC "
INT64_FORMAT " done in %.3f seconds\n",
node->no_id, event->ev_seqno,
--- 4438,4442 ----
dstring_free(&lsquery);
gettimeofday(&tv_now, NULL);
! slon_log(SLON_INFO, "remoteWorkerThread_%d: SYNC "
INT64_FORMAT " done in %.3f seconds\n",
node->no_id, event->ev_seqno,
***************
*** 4805,4809 ****
{
gettimeofday(&tv_now, NULL);
! slon_log(SLON_DEBUG2,
"remoteHelperThread_%d_%d: %.3f seconds delay for first row\n",
node->no_id, provider->no_id,
--- 4805,4809 ----
{
gettimeofday(&tv_now, NULL);
! slon_log(SLON_DEBUG1,
"remoteHelperThread_%d_%d: %.3f seconds delay for first row\n",
node->no_id, provider->no_id,
***************
*** 5052,5061 ****
gettimeofday(&tv_now, NULL);
! slon_log(SLON_DEBUG2,
"remoteHelperThread_%d_%d: %.3f seconds until close cursor\n",
node->no_id, provider->no_id,
TIMEVAL_DIFF(&tv_start, &tv_now));
! slon_log(SLON_DEBUG2, "remoteHelperThread_%d_%d: inserts=%d updates=%d deletes=%d\n",
node->no_id, provider->no_id, num_inserts, num_updates, num_deletes);
--- 5052,5061 ----
gettimeofday(&tv_now, NULL);
! slon_log(SLON_DEBUG1,
"remoteHelperThread_%d_%d: %.3f seconds until close cursor\n",
node->no_id, provider->no_id,
TIMEVAL_DIFF(&tv_start, &tv_now));
! slon_log(SLON_INFO, "remoteHelperThread_%d_%d: inserts=%d updates=%d deletes=%d\n",
node->no_id, provider->no_id, num_inserts, num_updates, num_deletes);
Index: slon.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/slon.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** slon.c 14 Jun 2007 14:58:54 -0000 1.73
--- slon.c 27 Jun 2007 16:20:24 -0000 1.74
***************
*** 456,460 ****
#endif
! slon_log(SLON_DEBUG2, "main: main process started\n");
/*
--- 456,460 ----
#endif
! slon_log(SLON_INFO, "main: main process started\n");
/*
***************
*** 784,788 ****
struct sigaction act;
#endif
! slon_log(SLON_DEBUG2, "slon: watchdog process started\n");
/*
--- 784,788 ----
struct sigaction act;
#endif
! slon_log(SLON_INFO, "slon: watchdog process started\n");
/*
***************
*** 834,838 ****
}
! slon_log(SLON_DEBUG2, "slon: watchdog ready - pid = %d\n", slon_watchdog_pid);
slon_worker_pid = fork();
--- 834,838 ----
}
! slon_log(SLON_CONFIG, "slon: watchdog ready - pid = %d\n", slon_watchdog_pid);
slon_worker_pid = fork();
***************
*** 843,847 ****
}
! slon_log(SLON_DEBUG2, "slon: worker process created - pid = %d\n",
slon_worker_pid);
while ((pid = wait(&child_status)) != slon_worker_pid)
--- 843,847 ----
}
! slon_log(SLON_CONFIG, "slon: worker process created - pid = %d\n",
slon_worker_pid);
while ((pid = wait(&child_status)) != slon_worker_pid)
***************
*** 978,986 ****
if (pid_file)
{
! slon_log(SLON_DEBUG2, "slon: remove pid file\n");
(void) unlink(pid_file);
}
! slon_log(SLON_DEBUG2, "slon: exit(%d)\n", code);
exit(code);
--- 978,986 ----
if (pid_file)
{
! slon_log(SLON_INFO, "slon: remove pid file\n");
(void) unlink(pid_file);
}
! slon_log(SLON_INFO, "slon: exit(%d)\n", code);
exit(code);
Index: confoptions.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/confoptions.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** confoptions.c 20 Apr 2007 20:53:18 -0000 1.23
--- confoptions.c 27 Jun 2007 16:20:24 -0000 1.24
***************
*** 451,455 ****
else
{
! slon_log(SLON_DEBUG2, "parameter \"%s\"\n", name);
}
--- 451,455 ----
else
{
! slon_log(SLON_CONFIG, "parameter \"%s\"\n", name);
}
***************
*** 479,483 ****
else
{
! slon_log(SLON_DEBUG2, "parameter \"%s\"\n", name);
}
*conf->variable = newval;
--- 479,483 ----
else
{
! slon_log(SLON_CONFIG, "parameter \"%s\"\n", name);
}
*conf->variable = newval;
***************
*** 507,511 ****
else
{
! slon_log(SLON_DEBUG2, "parameter \"%s\"\n", name);
}
*conf->variable = newval;
--- 507,511 ----
else
{
! slon_log(SLON_CONFIG, "parameter \"%s\"\n", name);
}
*conf->variable = newval;
***************
*** 527,531 ****
else
{
! slon_log(SLON_DEBUG2, "parameter \"%s\"\n", name);
free(newval);
}
--- 527,531 ----
else
{
! slon_log(SLON_CONFIG, "parameter \"%s\"\n", name);
free(newval);
}
- Previous message: [Slony1-commit] slony1-engine RELEASE-2.0
- Next message: [Slony1-commit] slony1-engine/doc/adminguide loganalysis.sgml slon.sgml slonconf.sgml slonik_ref.sgml
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list