Thu Jun 11 12:03:47 PDT 2009
- Previous message: [Slony1-commit] slony1-engine/doc/adminguide Makefile adminscripts.sgml failover.sgml faq.sgml firstdb.sgml installation.sgml monitoring.sgml
- Next message: [Slony1-commit] slony1-engine/src/slonik slonik.c
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /home/cvsd/slony1/slony1-engine/src/slon In directory main.slony.info:/tmp/cvs-serv5001/src/slon Modified Files: cleanup_thread.c confoptions.c misc.c scheduler.c Log Message: Draw a whole pile of changes into HEAD from the 2.0 branch Index: cleanup_thread.c =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/src/slon/cleanup_thread.c,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** cleanup_thread.c 28 May 2008 19:09:37 -0000 1.45 --- cleanup_thread.c 11 Jun 2009 19:03:45 -0000 1.46 *************** *** 190,193 **** --- 190,194 ---- char *tab_nspname = PQgetvalue(res, t, 0); char *tab_relname = PQgetvalue(res, t, 1); + ExecStatusType vrc; slon_log(SLON_DEBUG1, "cleanupThread: %s analyze \"%s\".%s;\n", *************** *** 197,209 **** vacuum_action, tab_nspname, tab_relname); res2 = PQexec(dbconn, dstring_data(&query_pertbl)); ! if (PQresultStatus(res) != PGRES_COMMAND_OK) /* query error */ { slon_log(SLON_ERROR, ! "cleanupThread: \"%s\" - %s", ! dstring_data(&query_pertbl), PQresultErrorMessage(res2)); /* * slon_retry(); break; */ } PQclear(res2); --- 198,218 ---- vacuum_action, tab_nspname, tab_relname); res2 = PQexec(dbconn, dstring_data(&query_pertbl)); ! vrc = PQresultStatus(res); ! if (vrc == PGRES_FATAL_ERROR) { slon_log(SLON_ERROR, ! "cleanupThread: \"%s\" - %s\n", ! dstring_data(&query_pertbl), PQresultErrorMessage(res2)); /* * slon_retry(); break; */ + } else { + if (vrc == PGRES_NONFATAL_ERROR) { + slon_log(SLON_WARN, + "cleanupThread: \"%s\" - %s\n", + dstring_data(&query_pertbl), PQresultErrorMessage(res2)); + + } } PQclear(res2); Index: confoptions.c =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/src/slon/confoptions.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** confoptions.c 1 Apr 2009 17:11:52 -0000 1.30 --- confoptions.c 11 Jun 2009 19:03:45 -0000 1.31 *************** *** 47,51 **** { slon_log(SLON_CONFIG, "main: String option %s = %s\n", ! ConfigureNamesString[i].gen.name, *(ConfigureNamesString[i].variable)); } --- 47,51 ---- { slon_log(SLON_CONFIG, "main: String option %s = %s\n", ! ConfigureNamesString[i].gen.name, ((*ConfigureNamesString[i].variable)==NULL)?"[NULL]":*(ConfigureNamesString[i].variable)); } *************** *** 755,759 **** (const char *) "cleanup_deletelogs", gettext_noop("Should the cleanup thread DELETE sl_log_? entries or not"), ! gettext_noop("Should the cleanup thread DELETE sl_log_? entries or not"), SLON_C_BOOL }, --- 755,759 ---- (const char *) "cleanup_deletelogs", gettext_noop("Should the cleanup thread DELETE sl_log_? entries or not"), ! gettext_noop("Should the cleanup thread DELETE sl_log_? entries or leave trimming to the TRUNCATE"), SLON_C_BOOL },
- Previous message: [Slony1-commit] slony1-engine/doc/adminguide Makefile adminscripts.sgml failover.sgml faq.sgml firstdb.sgml installation.sgml monitoring.sgml
- Next message: [Slony1-commit] slony1-engine/src/slonik slonik.c
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list