CVS User Account cvsuser
Wed Apr 19 15:03:43 PDT 2006
Log Message:
-----------
Should be purely a cosmetic set of changes...

- Various slon_log() calls did not have format strings ending with NL,
  so that the errors in the logs weren't separated by newlines

- Also a little bit of whitespace reformatting

Modified Files:
--------------
    slony1-engine/src/slon:
        remote_worker.c (r1.110 -> r1.111)

-------------- next part --------------
Index: remote_worker.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -Lsrc/slon/remote_worker.c -Lsrc/slon/remote_worker.c -u -w -r1.110 -r1.111
--- src/slon/remote_worker.c
+++ src/slon/remote_worker.c
@@ -590,7 +590,7 @@
 
 			/*
 			 * replace query1 with the forwarding of all the grouped sync
-			 * events and a commit. Also free all the WMSG structres except
+			 * events and a commit. Also free all the WMSG structures except
 			 * the last one (it's freed further down).
 			 */
 			dstring_reset(&query1);
@@ -4078,7 +4078,7 @@
 		if (rc < 0)
 		{
 			slon_log(SLON_ERROR, "remoteWorkerThread_%d: "
-					 "Cannot write to archive file %s - %s",
+					 "Cannot write to archive file %s - %s\n",
 					 node->no_id, archive_tmp, strerror(errno));
 			return 60;
 		}
@@ -4431,7 +4431,7 @@
 				if (rc < 0)
 				{
 					slon_log(SLON_ERROR, "remoteWorkerThread_%d: "
-							 "Cannot write to archive file %s - %s",
+							 "Cannot write to archive file %s - %s\n",
 							 node->no_id, archive_tmp, strerror(errno));
 					return 60;
 				}
@@ -4471,7 +4471,7 @@
 			if (rc < 0)
 			{
 				slon_log(SLON_ERROR, "remoteWorkerThread_%d: "
-						 "Could not close out archive file %s - %s",
+						 "Could not close out archive file %s - %s\n",
 						 node->no_id, archive_tmp, strerror(errno));
 				return 60;
 			}
@@ -4487,7 +4487,7 @@
 	res1 = PQexec(local_dbconn, dstring_data(&query));
 	if (PQresultStatus(res1) != PGRES_TUPLES_OK)
 	{
-		slon_log(SLON_ERROR, "remoteWorkerThread_%d: \"%s\" %s",
+		slon_log(SLON_ERROR, "remoteWorkerThread_%d: \"%s\" %s\n",
 				 node->no_id, dstring_data(&query),
 				 PQresultErrorMessage(res1));
 		PQclear(res1);
@@ -4499,7 +4499,7 @@
 	ntuples1 = PQntuples(res1);
 	if (ntuples1 != 1)
 	{
-		slon_log(SLON_ERROR, "remoteWorkerThread_%d: cannot determine current log status",
+		slon_log(SLON_ERROR, "remoteWorkerThread_%d: cannot determine current log status\n",
 				 node->no_id);
 		PQclear(res1);
 		TERMINATE_QUERY_AND_ARCHIVE;
@@ -4634,7 +4634,7 @@
 						if (rc < 0)
 						{
 							slon_log(SLON_ERROR, "remoteWorkerThread_%d: "
-									 "Cannot write to archive file %s - %s",
+									 "Cannot write to archive file %s - %s\n",
 								  node->no_id, archive_tmp, strerror(errno));
 							return 60;
 						}
@@ -4769,7 +4769,7 @@
 		res1 = PQexec(provider->conn->dbconn, dstring_data(&query));
 		if (PQresultStatus(res1) != PGRES_TUPLES_OK)
 		{
-			slon_log(SLON_ERROR, "remoteWorkerThread_%d: \"%s\" %s",
+			slon_log(SLON_ERROR, "remoteWorkerThread_%d: \"%s\" %s\n",
 					 node->no_id, dstring_data(&query),
 					 PQresultErrorMessage(res1));
 			PQclear(res1);
@@ -4808,7 +4808,7 @@
 				if (rc < 0)
 				{
 					slon_log(SLON_ERROR, "remoteWorkerThread_%d: "
-							 "Cannot write to archive file %s - %s",
+							 "Cannot write to archive file %s - %s\n",
 							 node->no_id, archive_tmp, strerror(errno));
 					return 60;
 				}
@@ -5030,7 +5030,7 @@
 			if (rc != PGRES_TUPLES_OK)
 			{
 				slon_log(SLON_ERROR,
-						 "remoteWorkerThread_%d: \"%s\" %s %s",
+						 "remoteWorkerThread_%d: \"%s\" %s %s\n",
 						 node->no_id, dstring_data(&query),
 						 PQresStatus(rc),
 						 PQresultErrorMessage(res3));



More information about the Slony1-commit mailing list