postgres.git / summary / log / commit / refs

commit    4c6c6b52d27fa60ddb287efb194ae77ee9385248
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Fri Feb 19 14:12:19 2010 +0000
First released in: 9.0.0

    Small corrections to message output targets in pg_ctl
    
    - The message "server stopped" should be affected by the -s option, just
      like "server started" already was.
    
    - The message "could not start server" should consistently go to stderr.


 src/bin/pg_ctl/pg_ctl.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index a24e5dc3275..23d32e64697 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.118 2010/01/02 16:57:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.119 2010/02/19 14:12:19 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -748,7 +748,9 @@ do_start(void)
 
 		if (test_postmaster_connection(false) == false)
 		{
-			printf(_("could not start server\n"));
+			write_stderr(_("%s: could not start server\n"
+						   "Examine the log output.\n"),
+						 progname);
 			exit(1);
 		}
 		else
@@ -828,7 +830,7 @@ do_stop(void)
 		}
 		print_msg(_(" done\n"));
 
-		printf(_("server stopped\n"));
+		print_msg(_("server stopped\n"));
 	}
 }
 
@@ -907,7 +909,7 @@ do_restart(void)
 		}
 
 		print_msg(_(" done\n"));
-		printf(_("server stopped\n"));
+		print_msg(_("server stopped\n"));
 	}
 	else
 	{


[parent: ad458cfe81bc]