Fix comment typo

Update HISTORY
Improve "archive_mode" configuration check
2026-03-23 15:16:29 +00:00 · 2016-01-19 11:40:03 +09:00 · 2016-01-14 11:51:51 +09:00 · 2016-01-14 11:51:30 +09:00 · 2016-01-05 15:57:25 +09:00 · 2016-01-05 13:36:34 +09:00
47 changed files with 2797 additions and 10743 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@ License and Contributions
 =========================

 `repmgr` is licensed under the GPL v3.  All of its code and documentation is
-Copyright 2010-2017, 2ndQuadrant Limited.  See the files COPYRIGHT and LICENSE for
+Copyright 2010-2016, 2ndQuadrant Limited.  See the files COPYRIGHT and LICENSE for
 details.

 The development of repmgr has primarily been sponsored by 2ndQuadrant customers.
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2017, 2ndQuadrant Limited
+Copyright (c) 2010-2016, 2ndQuadrant Limited
 All rights reserved.

 This program is free software: you can redistribute it and/or modify
--- a/FAILOVER.rst
+++ b/FAILOVER.rst
@@ -1 +1,238 @@
-The contents of this file have been incorporated into the main README.md document.
+====================================================
+ PostgreSQL Automatic Failover - User Documentation
+====================================================
+
+Automatic Failover
+==================
+
+repmgr allows for automatic failover when it detects the failure of the master node.
+Following is a quick setup for this.
+
+Installation
+============
+
+For convenience, we define:
+
+**node1**
+    is the fully qualified domain name of the Master server, IP 192.168.1.10
+**node2**
+    is the fully qualified domain name of the Standby server, IP 192.168.1.11
+**witness**
+    is the fully qualified domain name of the server used as a witness, IP 192.168.1.12
+
+**Note:** We don't recommend using names with the status of a server like «masterserver»,
+because it would be confusing once a failover takes place and the Master is
+now on the «standbyserver».
+
+Summary
+-------
+
+2 PostgreSQL servers are involved in the replication.  Automatic failover needs
+a vote to decide what server it should promote, so an odd number is required.
+A witness-repmgrd is installed in a third server where it uses a PostgreSQL
+cluster to communicate with other repmgrd daemons.
+
+1. Install PostgreSQL in all the servers involved (including the witness server)
+
+2. Install repmgr in all the servers involved (including the witness server)
+
+3. Configure the Master PostreSQL
+
+4. Clone the Master to the Standby using "repmgr standby clone" command
+
+5. Configure repmgr in all the servers involved (including the witness server)
+
+6. Register Master and Standby nodes
+
+7. Initiate witness server
+
+8. Start the repmgrd daemons in all nodes
+
+**Note** A complete High-Availability design needs at least 3 servers to still have
+a backup node after a first failure.
+
+Install PostgreSQL
+------------------
+
+You can install PostgreSQL using any of the recommended methods. You should ensure
+it's 9.0 or later.
+
+Install repmgr
+--------------
+
+Install repmgr following the steps in the README file.
+
+Configure PostreSQL
+-------------------
+
+Log in to node1.
+
+Edit the file postgresql.conf and modify the parameters::
+
+  listen_addresses='*'
+  wal_level = 'hot_standby'
+  archive_mode = on
+  archive_command = 'cd .'   # we can also use exit 0, anything that
+                             # just does nothing
+  max_wal_senders = 10
+  wal_keep_segments = 5000   # 80 GB required on pg_xlog
+  hot_standby = on
+  shared_preload_libraries = 'repmgr_funcs'
+
+Edit the file pg_hba.conf and add lines for the replication::
+
+  host     repmgr           repmgr      127.0.0.1/32            trust
+  host     repmgr           repmgr      192.168.1.10/30         trust
+  host     replication      all         192.168.1.10/30         trust
+
+**Note:** It is also possible to use a password authentication (md5), .pgpass file
+should be edited to allow connection between each node.
+
+Create the user and database to manage replication::
+
+  su - postgres
+  createuser -s repmgr
+  createdb -O repmgr repmgr
+
+Restart the PostgreSQL server::
+
+  pg_ctl -D $PGDATA restart
+
+And check everything is fine in the server log.
+
+Create the ssh-key for the postgres user and copy it to other servers::
+
+  su - postgres
+  ssh-keygen             # /!\ do not use a passphrase /!\
+  cat ~/.ssh/id_rsa.pub > ~/.ssh/authorized_keys
+  chmod 600 ~/.ssh/authorized_keys
+  exit
+  rsync -avz ~postgres/.ssh/authorized_keys node2:~postgres/.ssh/
+  rsync -avz ~postgres/.ssh/authorized_keys witness:~postgres/.ssh/
+  rsync -avz ~postgres/.ssh/id_rsa* node2:~postgres/.ssh/
+  rsync -avz ~postgres/.ssh/id_rsa* witness:~postgres/.ssh/
+
+Clone Master
+------------
+
+Log in to node2.
+
+Clone node1 (the current Master)::
+
+  su - postgres
+  repmgr -d repmgr -U repmgr -h node1 standby clone
+
+Start the PostgreSQL server::
+
+  pg_ctl -D $PGDATA start
+
+And check everything is fine in the server log.
+
+Configure repmgr
+----------------
+
+Log in to each server and configure repmgr by editing the file
+/etc/repmgr/repmgr.conf::
+
+  cluster=my_cluster
+  node=1
+  node_name=earth
+  conninfo='host=192.168.1.10 dbname=repmgr user=repmgr'
+  master_response_timeout=60
+  reconnect_attempts=6
+  reconnect_interval=10
+  failover=automatic
+  promote_command='promote_command.sh'
+  follow_command='repmgr standby follow -f /etc/repmgr/repmgr.conf'
+
+**cluster**
+    is the name of the current replication.
+**node**
+    is the number of the current node (1, 2 or 3 in the current example).
+**node_name**
+    is an identifier for every node.
+**conninfo**
+    is used to connect to the local PostgreSQL server (where the configuration file is) from any node. In the witness server configuration you need to add a 'port=5499' to the conninfo.
+**master_response_timeout**
+    is the maximum amount of time we are going to wait before deciding the master has died and start the failover procedure.
+**reconnect_attempts**
+    is the number of times we will try to reconnect to master after a failure has been detected and before start the failover procedure.
+**reconnect_interval**
+    is the amount of time between retries to reconnect to master after a failure has been detected and before start the failover procedure.
+**failover**
+    configure behavior: *manual* or *automatic*.
+**promote_command**
+    the command executed to do the failover (including the PostgreSQL failover itself). The command must return 0 on success.
+**follow_command**
+    the command executed to address the current standby to another Master. The command must return 0 on success.
+
+Register Master and Standby
+---------------------------
+
+Log in to node1.
+
+Register the node as master::
+
+  su - postgres
+  repmgr -f /etc/repmgr/repmgr.conf master register
+
+This will also create the repmgr schema and functions.
+
+Log in to node2. Register it as a standby::
+
+  su - postgres
+  repmgr -f /etc/repmgr/repmgr.conf standby register
+
+Initialize witness server
+-------------------------
+
+Log in to witness.
+
+Initialize the witness server::
+
+  su - postgres
+  repmgr -d repmgr -U repmgr -h 192.168.1.10 -D $WITNESS_PGDATA -f /etc/repmgr/repmgr.conf witness create
+
+The witness server needs the following information from the command
+line:
+
+* Connection details for the current master, to copy the cluster
+  configuration.
+* A location for initializing its own $PGDATA.
+
+repmgr will also ask for the superuser password on the witness database so
+it can reconnect when needed (the command line option --initdb-no-pwprompt
+will set up a password-less superuser).
+
+By default the witness server will listen on port 5499; this value can be
+overridden by explicitly providing the port number in the conninfo string
+in repmgr.conf. (Note that it is also possible to specify the port number
+with the -l/--local-port option, however this option is now deprecated and
+will be overridden by a port setting in the conninfo string).
+
+Start the repmgrd daemons
+-------------------------
+
+Log in to node2 and witness::
+
+  su - postgres
+  repmgrd -f /etc/repmgr/repmgr.conf --daemonize -> /var/log/postgresql/repmgr.log 2>&1
+
+**Note:** The Master does not need a repmgrd daemon.
+
+Suspend Automatic behavior
+==========================
+
+Edit the repmgr.conf of the node to remove from automatic processing and change::
+
+  failover=manual
+
+Then, signal repmgrd daemon::
+
+  su - postgres
+  kill -HUP $(pidof repmgrd)
+
+Usage
+=====
+
+The repmgr documentation is in the README file (how to build, options, etc.)
--- a/FAQ.md
+++ b/FAQ.md
@@ -38,7 +38,7 @@ General

  No. Hash indexes and replication do not mix well and their use is
  explicitly discouraged; see:
-    https://www.postgresql.org/docs/current/interactive/sql-createindex.html#AEN74175
+    http://www.postgresql.org/docs/current/interactive/sql-createindex.html#AEN74175

 `repmgr`
 --------
@@ -120,23 +120,6 @@ General
  permission is for PostgreSQL's streaming replication and doesn't
  necessarily need to be the `repmgr` user.

- When cloning a standby, why do I need to provide the connection parameters
-  for the primary server on the command line, not in the configuration file?
-
-  Cloning a standby is a one-time action; the role of the server being cloned
-  from could change, so fixing it in the configuration file would create
-  confusion. If `repmgr` needs to establish a connection to the primary
-  server, it can retrieve this from the `repl_nodes` table or if necessary
-  scan the replication cluster until it locates the active primary.
-
- Why is there no foreign key on the `node_id` column in the `repl_events`
-  table?
-
-  Under some circumstances event notifications can be generated for servers
-  which have not yet been registered; it's also useful to retain a record
-  of events which includes servers removed from the replication cluster
-  which no longer have an entry in the `repl_nodes` table.
-

 `repmgrd`
 ---------
@@ -152,9 +135,6 @@ General

  In `repmgr.conf`, set its priority to a value of 0 or less.

-  Additionally, if `failover` is set to `manual`, the node will never
-  be considered as a promotion candidate.
-
 - Does `repmgrd` support delayed standbys?

  `repmgrd` can monitor delayed standbys - those set up with
@@ -173,11 +153,3 @@ General

  Configure your system's `logrotate` service to do this; see example
  in README.md
-
- I've recloned a failed master as a standby, but `repmgrd` refuses to start?
-
-  Check you registered the standby after recloning. If unregistered the standby
-  cannot be considered as a promotion candidate even if `failover` is set to
-  `automatic`, which is probably not what you want. `repmgrd` will start if
-  `failover` is set to `manual` so the node's replication status can still
-  be monitored, if desired.
--- a/126
+++ b/126
@@ -1,129 +1,5 @@
-3.3.2   2017-06-01
-        Add support for PostgreSQL 10 (Ian)
-        repmgr: ensure --replication-user option is honoured when passing database
-          connection parameters as a conninfo string (Ian)
-        repmgr: improve detection of pg_rewind on remote server (Ian)
-        repmgr: add DETAIL log output for additional clarification of error messages (Ian)
-        repmgr: suppress various spurious error messages in `standby follow` and
-          `standby switchover` (Ian)
-        repmgr: add missing `-P` option (Ian)
-        repmgrd: monitoring statistic reporting fixes (Ian)
-
-3.3.1   2017-03-13
-        repmgrd: prevent invalid apply lag value being written to the
-          monitoring table (Ian)
-        repmgrd: fix error in XLogRecPtr conversion when calculating
-          monitoring statistics (Ian)
-        repmgr: if replication slots in use, where possible delete slot on old
-          upstream node after following new upstream (Ian)
-        repmgr: improve logging of rsync actions (Ian)
-        repmgr: improve `standby clone` when synchronous replication in use (Ian)
-        repmgr: stricter checking of allowed node id values
-        repmgr: enable `master register --force` when there is a foreign key
-          dependency from a standby node (Ian)
-
-3.3     2016-12-27
-        repmgr: always log to STDERR even if log facility defined (Ian)
-        repmgr: add --log-to-file to log repmgr output to the defined
-          log facility (Ian)
-        repmgr: improve handling of command line parameter errors (Ian)
-        repmgr: add option --upstream-conninfo to explicitly set
-          'primary_conninfo' in recovery.conf (Ian)
-        repmgr: enable a standby to be registered which isn't running (Ian)
-        repmgr: enable `standby register --force` to update a node record
-          with cascaded downstream node records (Ian)
-        repmgr: add option `--no-conninfo-password` (Abhijit, Ian)
-        repmgr: add initial support for PostgreSQL 10.0 (Ian)
-        repmgr: escape values in primary_conninfo if needed (Ian)
-
-3.2.1   2016-10-24
-        repmgr: require a valid repmgr cluster name unless -F/--force
-          supplied (Ian)
-        repmgr: check master server is registered with repmgr before
-          cloning (Ian)
-        repmgr: ensure data directory defaults to that of the source node (Ian)
-        repmgr: various fixes to Barman cloning mode (Gianni, Ian)
-        repmgr: fix `repmgr cluster crosscheck` output (Ian)
-
-3.2     2016-10-05
-        repmgr: add support for cloning from a Barman backup (Gianni)
-        repmgr: add commands `standby matrix` and `standby crosscheck` (Gianni)
-        repmgr: suppress connection error display in `repmgr cluster show`
-          unless `--verbose` supplied (Ian)
-        repmgr: add commands `witness register` and `witness unregister` (Ian)
-        repmgr: enable `standby unregister` / `witness unregister` to be
-          executed for a node which is not running (Ian)
-        repmgr: remove deprecated command line options --initdb-no-pwprompt and
-           -l/--local-port (Ian)
-        repmgr: before cloning with pg_basebackup, check that sufficient free
-           walsenders are available (Ian)
-        repmgr: add option `--wait-sync` for `standby register` which causes
-           repmgr to wait for the registered node record to synchronise to
-           the standby (Ian)
-        repmgr: add option `--copy-external-config-files` for files outside
-           of the data directory (Ian)
-        repmgr: only require `wal_keep_segments` to be set in certain corner
-           cases (Ian)
-        repmgr: better support cloning from a node other than the one to
-           stream from (Ian)
-        repmgrd: add configuration options to override the default pg_ctl
-           commands (Jarkko Oranen, Ian)
-        repmgrd: don't start if node is inactive and failover=automatic (Ian)
-        packaging: improve "repmgr-auto" Debian package (Gianni)
-
-
-3.1.5   2016-08-15
-        repmgrd: in a failover situation, prevent endless looping when
-          attempting to establish the status of a node with
-          `failover=manual` (Ian)
-        repmgrd: improve handling of failover events on standbys with
-          `failover=manual`, and create a new event notification
-          for this, `standby_disconnect_manual` (Ian)
-        repmgr: add further event notifications (Gianni)
-        repmgr: when executing `standby switchover`, don't collect remote
-          command output unless required (Gianni, Ian)
-        repmgrd: improve standby monitoring query (Ian, based on suggestion
-          from  Álvaro)
-        repmgr: various command line handling improvements (Ian)
-
-3.1.4   2016-07-12
-        repmgr: new configuration option for setting "restore_command"
-          in the recovery.conf file generated by repmgr (Martín)
-        repmgr: add --csv option to "repmgr cluster show" (Gianni)
-        repmgr: enable provision of a conninfo string as the -d/--dbname
-          parameter, similar to other PostgreSQL utilities (Ian)
-        repmgr: during switchover operations improve detection of
-          demotion candidate shutdown (Ian)
-        various bugfixes and documentation updates (Ian, Martín)
-
-3.1.3   2016-05-17
-        repmgrd: enable monitoring when a standby is catching up by
-          replaying archived WAL (Ian)
-        repmgrd: when upstream_node_id is NULL, assume upstream node
-          to be current master (Ian)
-        repmgrd: check for reappearance of the master node if standby
-          promotion fails (Ian)
-        improve handling of rsync failure conditions (Martín)
-
-3.1.2   2016-04-12
-        Fix pg_ctl path generation in do_standby_switchover() (Ian)
-        Regularly sync witness server repl_nodes table (Ian)
-        Documentation improvements (Gianni, dhyannataraj)
-        (Experimental) ensure repmgr handles failover slots when copying
-          in rsync mode (Craig, Ian)
-        rsync mode handling fixes (Martín)
-        Enable repmgr to compile against 9.6devel (Ian)
-
-3.1.1   2016-02-24
-        Add '-P/--pwprompt' option for "repmgr create witness" (Ian)
-        Prevent repmgr/repmgrd running as root (Ian)
-
-3.1.0   2016-02-01
-        Add "repmgr standby switchover" command (Ian)
-        Revised README file (Ian)
+3.0.4   2016-01-
        Remove requirement for 'archive_mode' to be enabled (Ian)
-        Improve -?/--help output, showing default values if relevant (Ian)
-        Various bugfixes to command line/configuration parameter handling (Ian)

 3.0.3   2016-01-04
        Create replication slot if required before base backup is run (Abhijit)
--- a/59
+++ b/59
@@ -1,34 +1,24 @@
 #
 # Makefile
-# Copyright (c) 2ndQuadrant, 2010-2017
-
-HEADERS = $(wildcard *.h)
+# Copyright (c) 2ndQuadrant, 2010-2016

 repmgrd_OBJS = dbutils.o config.o repmgrd.o log.o strutil.o
-repmgr_OBJS = dbutils.o check_dir.o config.o repmgr.o log.o strutil.o dirmod.o compat.o
+repmgr_OBJS = dbutils.o check_dir.o config.o repmgr.o log.o strutil.o

 DATA = repmgr.sql uninstall_repmgr.sql
-REGRESS = repmgr_funcs repmgr_test

-PG_CPPFLAGS = -I$(includedir_internal) -I$(libpq_srcdir)
-PG_LIBS     = $(libpq_pgport)
+PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_LIBS = $(libpq_pgport)

-
-all: repmgrd repmgr
+all:  repmgrd repmgr
 	$(MAKE) -C sql

 repmgrd: $(repmgrd_OBJS)
-	$(CC) -o repmgrd $(CFLAGS) $(repmgrd_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX)
+	$(CC) $(CFLAGS) $(repmgrd_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o repmgrd
 	$(MAKE) -C sql

 repmgr: $(repmgr_OBJS)
-	$(CC) -o repmgr $(CFLAGS) $(repmgr_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX)
-
-# Make all objects depend on all include files. This is a bit of a
-# shotgun approach, but the codebase is small enough that a complete rebuild
-# is very fast anyway.
-$(repmgr_OBJS): $(HEADERS)
-$(repmgrd_OBJS): $(HEADERS)
+	$(CC) $(CFLAGS) $(repmgr_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o repmgr

 ifdef USE_PGXS
 PG_CONFIG = pg_config
@@ -41,8 +31,8 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif

-# XXX: This overrides the pgxs install target - we're building two binaries,
-# which is not supported by pgxs.mk's PROGRAM construct.
+# XXX: Try to use PROGRAM construct (see pgxs.mk) someday. Right now
+# is overriding pgxs install.
 install: install_prog install_ext

 install_prog:
@@ -53,12 +43,6 @@ install_prog:
 install_ext:
 	$(MAKE) -C sql install

-# Distribution-specific package building targets
-# ----------------------------------------------
-#
-# XXX we recommend using the PGDG-supplied packages where possible;
-# see README.md for details.
-
 install_rhel:
 	mkdir -p '$(DESTDIR)/etc/init.d/'
 	$(INSTALL_PROGRAM) RHEL/repmgrd.init '$(DESTDIR)/etc/init.d/repmgrd'
@@ -83,23 +67,16 @@ clean:
 	rm -f repmgr
 	$(MAKE) -C sql clean

-# Get correct version numbers and install paths, depending on your postgres version
-PG_VERSION = $(shell pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1,2)
-REPMGR_VERSION = $(shell grep REPMGR_VERSION version.h | cut -d ' ' -f 3 | cut -d '"' -f 2)
-PKGLIBDIR = $(shell pg_config --pkglibdir)
-SHAREDIR = $(shell pg_config --sharedir)
-PGBINDIR = /usr/lib/postgresql/$(PG_VERSION)/bin
-
 deb: repmgrd repmgr
-	mkdir -p ./debian/usr/bin ./debian$(PGBINDIR)
-	cp repmgrd repmgr ./debian$(PGBINDIR)
-	ln -s ../..$(PGBINDIR)/repmgr ./debian/usr/bin/repmgr
-	mkdir -p ./debian$(SHAREDIR)/contrib/
-	cp sql/repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/
-	cp sql/uninstall_repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/
-	mkdir -p ./debian$(PKGLIBDIR)/
-	cp sql/repmgr_funcs.so ./debian$(PKGLIBDIR)/
+	mkdir -p ./debian/usr/bin
+	cp repmgrd repmgr ./debian/usr/bin/
+	mkdir -p ./debian/usr/share/postgresql/9.0/contrib/
+	cp sql/repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/
+	cp sql/uninstall_repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/
+	mkdir -p ./debian/usr/lib/postgresql/9.0/lib/
+	cp sql/repmgr_funcs.so ./debian/usr/lib/postgresql/9.0/lib/
 	dpkg-deb --build debian
-	mv debian.deb ../postgresql-repmgr-$(PG_VERSION)_$(REPMGR_VERSION).deb
+	mv debian.deb ../postgresql-repmgr-9.0_1.0.0.deb
 	rm -rf ./debian/usr

+
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -1 +1,118 @@
-The contents of this file have been incorporated into the main README.md document.
+repmgr quickstart guide
+=======================
+
+This quickstart guide provides some annotated examples on basic
+`repmgr` setup. It assumes you are familiar with PostgreSQL replication
+concepts setup and Linux/UNIX system administration.
+
+For the purposes of this guide, we'll assume the database user will be
+`repmgr_usr` and the database will be `repmgr_db`.
+
+
+Master setup
+------------
+
+1. Configure PostgreSQL
+
+  - create user and database:
+
+	```
+	CREATE ROLE repmgr_usr LOGIN SUPERUSER;
+	CREATE DATABASE repmgr_db OWNER repmgr_usr;
+	```
+
+  - configure `postgresql.conf` for replication (see README.md for sample
+    settings)
+
+  - update `pg_hba.conf`, e.g.:
+
+	```
+	host    repmgr_db       repmgr_usr  192.168.1.0/24         trust
+	host    replication     repmgr_usr  192.168.1.0/24         trust
+	```
+
+  Restart the PostgreSQL server after making these changes.
+
+2. Create the `repmgr` configuration file:
+
+        $ cat /path/to/repmgr/node1/repmgr.conf
+        cluster=test
+        node=1
+        node_name=node1
+        conninfo='host=repmgr_node1 user=repmgr_usr dbname=repmgr_db'
+        pg_bindir=/path/to/postgres/bin
+
+   (For an annotated `repmgr.conf` file, see `repmgr.conf.sample` in the
+   repository's root directory).
+
+3. Register the master node with `repmgr`:
+
+        $ repmgr -f /path/to/repmgr/node1/repmgr.conf --verbose master register
+        [2015-03-03 17:45:53] [INFO] repmgr connecting to master database
+        [2015-03-03 17:45:53] [INFO] repmgr connected to master, checking its state
+        [2015-03-03 17:45:53] [INFO] master register: creating database objects inside the repmgr_test schema
+        [2015-03-03 17:45:53] [NOTICE] Master node correctly registered for cluster test with id 1 (conninfo: host=localhost user=repmgr_usr dbname=repmgr_db)
+
+Standby setup
+-------------
+
+1. Use `repmgr standby clone` to clone a standby from the master:
+
+        repmgr -D /path/to/standby/data -d repmgr_db -U repmgr_usr --verbose standby clone 192.168.1.2
+        [2015-03-03 18:18:21] [NOTICE] No configuration file provided and default file './repmgr.conf' not found - continuing with default values
+        [2015-03-03 18:18:21] [NOTICE] repmgr Destination directory ' /path/to/standby/data' provided
+        [2015-03-03 18:18:21] [INFO] repmgr connecting to upstream node
+        [2015-03-03 18:18:21] [INFO] repmgr connected to upstream node, checking its state
+        [2015-03-03 18:18:21] [INFO] Successfully connected to upstream node. Current installation size is 27 MB
+        [2015-03-03 18:18:21] [NOTICE] Starting backup...
+        [2015-03-03 18:18:21] [INFO] creating directory " /path/to/standby/data"...
+        [2015-03-03 18:18:21] [INFO] Executing: 'pg_basebackup -l "repmgr base backup"  -h localhost -p 9595 -U repmgr_usr -D  /path/to/standby/data '
+        NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
+        [2015-03-03 18:18:23] [NOTICE] repmgr standby clone (using pg_basebackup) complete
+        [2015-03-03 18:18:23] [NOTICE] HINT: You can now start your postgresql server
+        [2015-03-03 18:18:23] [NOTICE] for example : pg_ctl -D  /path/to/standby/data start
+
+  Note that the `repmgr.conf` file is not required when cloning a standby.
+  However we recommend providing a valid `repmgr.conf` if you wish to use
+  replication slots, or want `repmgr` to log the clone event to the
+  `repl_events` table.
+
+  This will clone the PostgreSQL database files from the master, including its
+  `postgresql.conf` and `pg_hba.conf` files, and additionally automatically create
+  the `recovery.conf` file containing the correct parameters to start streaming
+  from the primary node.
+
+2. Start the PostgreSQL server
+
+3. Create the `repmgr` configuration file:
+
+        $ cat /path/node2/repmgr/repmgr.conf
+        cluster=test
+        node=2
+        node_name=node2
+        conninfo='host=repmgr_node2 user=repmgr_usr dbname=repmgr_db'
+        pg_bindir=/path/to/postgres/bin
+
+4. Register the standby node with `repmgr`:
+
+        $ repmgr -f /path/to/repmgr/node2/repmgr.conf --verbose standby register
+        [2015-03-03 18:24:34] [NOTICE] Opening configuration file: /path/to/repmgr/node2/repmgr.conf
+        [2015-03-03 18:24:34] [INFO] repmgr connecting to standby database
+        [2015-03-03 18:24:34] [INFO] repmgr connecting to master database
+        [2015-03-03 18:24:34] [INFO] finding node list for cluster 'test'
+        [2015-03-03 18:24:34] [INFO] checking role of cluster node '1'
+        [2015-03-03 18:24:34] [INFO] repmgr connected to master, checking its state
+        [2015-03-03 18:24:34] [INFO] repmgr registering the standby
+        [2015-03-03 18:24:34] [INFO] repmgr registering the standby complete
+        [2015-03-03 18:24:34] [NOTICE] Standby node correctly registered for cluster test with id 2 (conninfo: host=localhost user=repmgr_usr dbname=repmgr_db)
+
+
+This concludes the basic `repmgr` setup of master and standby. The records
+created in the `repl_nodes` table should look something like this:
+
+        repmgr_db=# SELECT * from repmgr_test.repl_nodes;
+         id |  type   | upstream_node_id | cluster | name  |                      conninfo                      | slot_name | priority | active
+        ----+---------+------------------+---------+-------+----------------------------------------------------+-----------+----------+--------
+          1 | primary |                  | test    | node1 | host=repmgr_node1 user=repmgr_usr dbname=repmgr_db |           |        0 | t
+          2 | standby |                1 | test    | node2 | host=repmgr_node2 user=repmgr_usr dbname=repmgr_db |           |        0 | t
+        (2 rows)
--- a/README.md
+++ b/README.md
--- a/RHEL/repmgr3-93.spec
+++ b/RHEL/repmgr3-93.spec
@@ -0,0 +1,61 @@
+Summary: repmgr
+Name: repmgr
+Version: 3.0
+Release: 1
+License: GPLv3
+Group: System Environment/Daemons
+URL: http://repmgr.org
+Packager: Ian Barwick <ian@2ndquadrant.com>
+Vendor: 2ndQuadrant Limited
+Distribution: centos
+Source0: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+repmgr is a utility suite which greatly simplifies
+the process of setting up and managing replication
+using streaming replication within a cluster of
+PostgreSQL servers.
+
+%prep
+%setup
+
+%build
+export PATH=$PATH:/usr/pgsql-9.3/bin/
+%{__make} USE_PGXS=1
+
+%install
+[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
+
+export PATH=$PATH:/usr/pgsql-9.3/bin/
+%{__make} USE_PGXS=1 install DESTDIR=%{buildroot} INSTALL="install -p"
+%{__make} USE_PGXS=1 install_prog DESTDIR=%{buildroot} INSTALL="install -p"
+%{__make} USE_PGXS=1 install_rhel DESTDIR=%{buildroot} INSTALL="install -p"
+
+
+%clean
+[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root)
+/usr/bin/repmgr
+/usr/bin/repmgrd
+/usr/pgsql-9.3/bin/repmgr
+/usr/pgsql-9.3/bin/repmgrd
+/usr/pgsql-9.3/lib/repmgr_funcs.so
+/usr/pgsql-9.3/share/contrib/repmgr.sql
+/usr/pgsql-9.3/share/contrib/repmgr_funcs.sql
+/usr/pgsql-9.3/share/contrib/uninstall_repmgr.sql
+/usr/pgsql-9.3/share/contrib/uninstall_repmgr_funcs.sql
+%attr(0755,root,root)/etc/init.d/repmgrd
+%attr(0644,root,root)/etc/sysconfig/repmgrd
+%attr(0644,root,root)/etc/repmgr/repmgr.conf.sample
+
+%changelog
+* Tue Mar 10 2015 Ian Barwick ian@2ndquadrant.com>
+- build for repmgr 3.0
+* Thu Jun 05 2014 Nathan Van Overloop <nathan.van.overloop@nexperteam.be> 2.0.2
+- fix witness creation to create db and user if needed
+* Fri Apr 04 2014 Nathan Van Overloop <nathan.van.overloop@nexperteam.be> 2.0.1
+- initial build for RHEL6
--- a/RHEL/repmgrd.init
+++ b/RHEL/repmgrd.init
@@ -0,0 +1,133 @@
+#!/bin/sh
+#
+# chkconfig: - 75 16
+# description: Enable repmgrd replication management and monitoring daemon for PostgreSQL
+# processname: repmgrd
+# pidfile="/var/run/${NAME}.pid"
+
+# Source function library.
+INITD=/etc/rc.d/init.d
+. $INITD/functions
+
+# Get function listing for cross-distribution logic.
+TYPESET=`typeset -f|grep "declare"`
+
+# Get network config.
+. /etc/sysconfig/network
+
+DESC="PostgreSQL replication management and monitoring daemon"
+NAME=repmgrd
+
+REPMGRD_ENABLED=no
+REPMGRD_OPTS=
+REPMGRD_USER=postgres
+REPMGRD_BIN=/usr/pgsql-9.3/bin/repmgrd
+REPMGRD_PIDFILE=/var/run/repmgrd.pid
+REPMGRD_LOCK=/var/lock/subsys/${NAME}
+REPMGRD_LOG=/var/lib/pgsql/9.3/data/pg_log/repmgrd.log
+
+# Read configuration variable file if it is present
+[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+    SU=runuser
+else
+    SU=su
+fi
+
+test -x $REPMGRD_BIN || exit 0
+
+case "$REPMGRD_ENABLED" in
+    [Yy]*)
+	break
+	;;
+    *)
+	exit 0
+	;;
+esac
+
+
+if [ -z "${REPMGRD_OPTS}" ]
+then
+    echo "Not starting ${NAME}, REPMGRD_OPTS not set in /etc/sysconfig/${NAME}"
+    exit 0
+fi
+
+start()
+{
+    REPMGRD_START=$"Starting ${NAME} service: "
+
+    # Make sure startup-time log file is valid
+    if [ ! -e "${REPMGRD_LOG}" -a ! -h "${REPMGRD_LOG}" ]
+    then
+        touch "${REPMGRD_LOG}" || exit 1
+        chown ${REPMGRD_USER}:postgres "${REPMGRD_LOG}"
+        chmod go-rwx "${REPMGRD_LOG}"
+        [ -x /sbin/restorecon ] && /sbin/restorecon "${REPMGRD_LOG}"
+    fi
+
+    echo -n "${REPMGRD_START}"
+    $SU -l $REPMGRD_USER -c "${REPMGRD_BIN} ${REPMGRD_OPTS} -p ${REPMGRD_PIDFILE} &" >> "${REPMGRD_LOG}" 2>&1 < /dev/null
+    sleep 2
+    pid=`head -n 1 "${REPMGRD_PIDFILE}" 2>/dev/null`
+    if [ "x${pid}" != "x" ]
+    then
+        success "${REPMGRD_START}"
+        touch "${REPMGRD_LOCK}"
+        echo $pid > "${REPMGRD_PIDFILE}"
+        echo
+    else
+        failure "${REPMGRD_START}"
+        echo
+        script_result=1
+    fi
+}
+
+stop()
+{
+    echo -n $"Stopping ${NAME} service: "
+    if [ -e "${REPMGRD_LOCK}" ]
+    then
+        killproc ${NAME}
+        ret=$? 
+        if [ $ret -eq 0 ]
+        then
+            echo_success
+            rm -f "${REPMGRD_PIDFILE}"
+            rm -f "${REPMGRD_LOCK}"
+        else
+            echo_failure
+            script_result=1
+        fi
+    else
+        # not running; per LSB standards this is "ok"   
+        echo_success
+    fi
+    echo
+}
+
+
+# See how we were called.
+case "$1" in
+  start)
+        start
+        ;;
+  stop)
+        stop
+        ;;
+  status)
+        status -p $REPMGRD_PIDFILE $NAME
+        script_result=$?
+        ;;
+  restart)
+        stop
+	start
+        ;;
+  *)
+        echo $"Usage: $0 {start|stop|status|restart}"
+        exit 2
+esac
+
+exit $script_result
--- a/RHEL/repmgrd.sysconfig
+++ b/RHEL/repmgrd.sysconfig
@@ -0,0 +1,21 @@
+# default settings for repmgrd. This file is source by /bin/sh from
+# /etc/init.d/repmgrd
+
+# disable repmgrd by default so it won't get started upon installation
+# valid values: yes/no
+REPMGRD_ENABLED=no
+
+# Options for repmgrd (required)
+#REPMGRD_OPTS="--verbose -d -f /var/lib/pgsql/repmgr/repmgr.conf"
+
+# User to run repmgrd as
+#REPMGRD_USER=postgres
+
+# repmgrd binary
+#REPMGRD_BIN=/usr/bin/repmgrd
+
+# pid file
+#REPMGRD_PIDFILE=/var/lib/pgsql/repmgr/repmgrd.pid
+
+# log file
+#REPMGRD_LOG=/var/lib/pgsql/repmgr/repmgrd.log
--- a/11
+++ b/11
@@ -40,6 +40,13 @@ Planned feature improvements
 * make old master node ID available for event notification commands
  (See github issue #80).

+* Have pg_basebackup use replication slots, if and when support for
+  this is added; see:
+    http://www.postgresql.org/message-id/555DD2B2.7020000@gmx.net
+
+* use "primary/standby" terminology in place of "master/slave" for consistency
+  with main PostrgreSQL usage
+
 * repmgr standby clone: possibility to use barman instead of performing a new base backup

 * possibility to transform a failed master into a new standby with pg_rewind
@@ -53,10 +60,6 @@ Planned feature improvements
  requested, activate the replication slot using pg_receivexlog to negate the
  need to set `wal_keep_segments` just for the initial clone (9.4 and 9.5).

-* repmgr: enable "standby follow" to point a standby at another standby, not
-  just the replication cluster master (see GitHub #130)
-
-
 Usability improvements
 ======================

--- a/check_dir.c
+++ b/check_dir.c
@@ -1,6 +1,6 @@
 /*
 * check_dir.c - Directories management functions
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2016
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/check_dir.h
+++ b/check_dir.h
@@ -1,6 +1,6 @@
 /*
 * check_dir.h
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2016
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/compat.c
+++ b/compat.c
@@ -1,107 +0,0 @@
-/*
- *
- * compat.c
- *	  Provides a couple of useful string utility functions adapted
- *	  from the backend code, which are not publicly exposed. They're
- *	  unlikely to change but it would be worth keeping an eye on them
- *	  for any fixes/improvements
- *
- * Copyright (c) 2ndQuadrant, 2010-2017
- *
- * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "repmgr.h"
-#include "compat.h"
-
-/*
- * Append the given string to the buffer, with suitable quoting for passing
- * the string as a value, in a keyword/pair value in a libpq connection
- * string
- *
- * This function is adapted from src/fe_utils/string_utils.c (before 9.6
- * located in: src/bin/pg_dump/dumputils.c)
- */
-void
-appendConnStrVal(PQExpBuffer buf, const char *str)
-{
-	const char *s;
-	bool		needquotes;
-
-	/*
-	 * If the string is one or more plain ASCII characters, no need to quote
-	 * it. This is quite conservative, but better safe than sorry.
-	 */
-	needquotes = true;
-	for (s = str; *s; s++)
-	{
-		if (!((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') ||
-			  (*s >= '0' && *s <= '9') || *s == '_' || *s == '.'))
-		{
-			needquotes = true;
-			break;
-		}
-		needquotes = false;
-	}
-
-	if (needquotes)
-	{
-		appendPQExpBufferChar(buf, '\'');
-		while (*str)
-		{
-			/* ' and \ must be escaped by to \' and \\ */
-			if (*str == '\'' || *str == '\\')
-				appendPQExpBufferChar(buf, '\\');
-
-			appendPQExpBufferChar(buf, *str);
-			str++;
-		}
-		appendPQExpBufferChar(buf, '\'');
-	}
-	else
-		appendPQExpBufferStr(buf, str);
-}
-
-/*
- * Adapted from: src/fe_utils/string_utils.c
- */
-void
-appendShellString(PQExpBuffer buf, const char *str)
-{
-	const char *p;
-
-	appendPQExpBufferChar(buf, '\'');
-	for (p = str; *p; p++)
-	{
-		if (*p == '\n' || *p == '\r')
-		{
-			fprintf(stderr,
-					_("shell command argument contains a newline or carriage return: \"%s\"\n"),
-					str);
-			exit(ERR_BAD_CONFIG);
-		}
-
-		if (*p == '\'')
-			appendPQExpBufferStr(buf, "'\"'\"'");
-		else
-			appendPQExpBufferChar(buf, *p);
-	}
-
-	appendPQExpBufferChar(buf, '\'');
-}
-
--- a/compat.h
+++ b/compat.h
@@ -1,29 +0,0 @@
-/*
- * compat.h
- * Copyright (c) 2ndQuadrant, 2010-2017
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef _COMPAT_H_
-#define _COMPAT_H_
-
-extern void
-appendConnStrVal(PQExpBuffer buf, const char *str);
-
-extern void
-appendShellString(PQExpBuffer buf, const char *str);
-
-#endif
--- a/config.c
+++ b/config.c
@@ -1,7 +1,6 @@
 /*
 * config.c - Functions to parse the config file
- *
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2016
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -10,11 +9,11 @@
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.	 If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */

@@ -27,12 +26,12 @@

 static void parse_event_notifications_list(t_configuration_options *options, const char *arg);
 static void tablespace_list_append(t_configuration_options *options, const char *arg);
-static void exit_with_errors(ItemList *config_errors);
+static void exit_with_errors(ErrorList *config_errors);

-const static char *_progname = NULL;
+const static char *_progname = '\0';
 static char config_file_path[MAXPGPATH];
 static bool config_file_provided = false;
-bool config_file_found = false;
+static bool config_file_found = false;


 void
@@ -55,8 +54,8 @@ progname(void)
 *
 * Returns true if a configuration file could be parsed, otherwise false.
 *
- * Any *repmgrd-specific* configuration options added/changed in this function must also be
- * added/changed in reload_config()
+ * Any configuration options changed in this function must also be changed in
+ * reload_config()
 *
 * NOTE: this function is called before the logger is set up, so we need
 * to handle the verbose option ourselves; also the default log level is NOTICE,
@@ -99,9 +98,9 @@ load_config(const char *config_file, bool verbose, t_configuration_options *opti
 	/*
 	 * If no configuration file was provided, attempt to find a default file
 	 * in this order:
-	 *	- current directory
-	 *	- /etc/repmgr.conf
-	 *	- default sysconfdir
+	 *  - current directory
+	 *  - /etc/repmgr.conf
+	 *  - default sysconfdir
 	 *
 	 * here we just check for the existence of the file; parse_config()
 	 * will handle read errors etc.
@@ -150,7 +149,7 @@ load_config(const char *config_file, bool verbose, t_configuration_options *opti

 		if (verbose == true)
 		{
-			log_notice(_("looking for configuration file in %s\n"), sysconf_etc_path);
+			log_notice(_("looking for configuration file in %s"), sysconf_etc_path);
 		}

 		snprintf(config_file_path, MAXPGPATH, "%s/%s", sysconf_etc_path, CONFIG_FILE_NAME);
@@ -181,23 +180,6 @@ load_config(const char *config_file, bool verbose, t_configuration_options *opti
 }


-bool
-parse_config(t_configuration_options *options)
-{
-	/* Collate configuration file errors here for friendlier reporting */
-	static ItemList config_errors = { NULL, NULL };
-
-	_parse_config(options, &config_errors);
-
-	if (config_errors.head != NULL)
-	{
-		exit_with_errors(&config_errors);
-	}
-
-	return true;
-}
-
-
 /*
 * Parse configuration file; if any errors are encountered,
 * list them and exit.
@@ -205,8 +187,8 @@ parse_config(t_configuration_options *options)
 * Ensure any default values set here are synced with repmgr.conf.sample
 * and any other documentation.
 */
-void
-_parse_config(t_configuration_options *options, ItemList *error_list)
+bool
+parse_config(t_configuration_options *options)
 {
 	FILE	   *fp;
 	char	   *s,
@@ -216,37 +198,30 @@ _parse_config(t_configuration_options *options, ItemList *error_list)

 	/* For sanity-checking provided conninfo string */
 	PQconninfoOption *conninfo_options;
-	char	   *conninfo_errmsg = NULL;
+	char       *conninfo_errmsg = NULL;

-	bool		node_found = false;
+	/* Collate configuration file errors here for friendlier reporting */
+	static ErrorList config_errors = { NULL, NULL };

 	/* Initialize configuration options with sensible defaults
 	 * note: the default log level is set in log.c and does not need
 	 * to be initialised here
 	 */
 	memset(options->cluster_name, 0, sizeof(options->cluster_name));
-	options->node = UNKNOWN_NODE_ID;
+	options->node = -1;
 	options->upstream_node = NO_UPSTREAM_NODE;
 	options->use_replication_slots = 0;
 	memset(options->conninfo, 0, sizeof(options->conninfo));
-	memset(options->barman_server, 0, sizeof(options->barman_server));
-	memset(options->barman_config, 0, sizeof(options->barman_config));
 	options->failover = MANUAL_FAILOVER;
 	options->priority = DEFAULT_PRIORITY;
 	memset(options->node_name, 0, sizeof(options->node_name));
 	memset(options->promote_command, 0, sizeof(options->promote_command));
 	memset(options->follow_command, 0, sizeof(options->follow_command));
-	memset(options->service_stop_command, 0, sizeof(options->service_stop_command));
-	memset(options->service_start_command, 0, sizeof(options->service_start_command));
-	memset(options->service_restart_command, 0, sizeof(options->service_restart_command));
-	memset(options->service_reload_command, 0, sizeof(options->service_reload_command));
-	memset(options->service_promote_command, 0, sizeof(options->service_promote_command));
 	memset(options->rsync_options, 0, sizeof(options->rsync_options));
 	memset(options->ssh_options, 0, sizeof(options->ssh_options));
 	memset(options->pg_bindir, 0, sizeof(options->pg_bindir));
 	memset(options->pg_ctl_options, 0, sizeof(options->pg_ctl_options));
 	memset(options->pg_basebackup_options, 0, sizeof(options->pg_basebackup_options));
-	memset(options->restore_command, 0, sizeof(options->restore_command));

 	/* default master_response_timeout is 60 seconds */
 	options->master_response_timeout = 60;
@@ -258,12 +233,7 @@ _parse_config(t_configuration_options *options, ItemList *error_list)
 	options->monitor_interval_secs = 2;
 	options->retry_promote_interval_secs = 300;

-	/* default to resyncing repl_nodes table every 30 seconds on the witness server */
-	options->witness_repl_nodes_sync_interval_secs = 30;
-
 	memset(options->event_notification_command, 0, sizeof(options->event_notification_command));
-	options->event_notifications.head = NULL;
-	options->event_notifications.tail = NULL;

 	options->tablespace_mapping.head = NULL;
 	options->tablespace_mapping.tail = NULL;
@@ -274,9 +244,9 @@ _parse_config(t_configuration_options *options, ItemList *error_list)
 	 */
 	if (config_file_found == false)
 	{
-		log_verbose(LOG_NOTICE, _("no configuration file provided and no default file found - "
+		log_notice(_("no configuration file provided and no default file found - "
 					 "continuing with default values\n"));
-		return;
+		return true;
 	}

 	fp = fopen(config_file_path, "r");
@@ -320,18 +290,11 @@ _parse_config(t_configuration_options *options, ItemList *error_list)
 		if (strcmp(name, "cluster") == 0)
 			strncpy(options->cluster_name, value, MAXLEN);
 		else if (strcmp(name, "node") == 0)
-		{
-			options->node = repmgr_atoi(value, "node", error_list, false);
-			node_found = true;
-		}
+			options->node = repmgr_atoi(value, "node", &config_errors);
 		else if (strcmp(name, "upstream_node") == 0)
-			options->upstream_node = repmgr_atoi(value, "upstream_node", error_list, false);
+			options->upstream_node = repmgr_atoi(value, "upstream_node", &config_errors);
 		else if (strcmp(name, "conninfo") == 0)
 			strncpy(options->conninfo, value, MAXLEN);
-		else if (strcmp(name, "barman_server") == 0)
-			strncpy(options->barman_server, value, MAXLEN);
-		else if (strcmp(name, "barman_config") == 0)
-			strncpy(options->barman_config, value, MAXLEN);
 		else if (strcmp(name, "rsync_options") == 0)
 			strncpy(options->rsync_options, value, QUERY_STR_LEN);
 		else if (strcmp(name, "ssh_options") == 0)
@@ -356,39 +319,28 @@ _parse_config(t_configuration_options *options, ItemList *error_list)
 			}
 			else
 			{
-				item_list_append(error_list, _("value for 'failover' must be 'automatic' or 'manual'\n"));
+				error_list_append(&config_errors,_("value for 'failover' must be 'automatic' or 'manual'\n"));
 			}
 		}
 		else if (strcmp(name, "priority") == 0)
-			options->priority = repmgr_atoi(value, "priority", error_list, true);
+			options->priority = repmgr_atoi(value, "priority", &config_errors);
 		else if (strcmp(name, "node_name") == 0)
 			strncpy(options->node_name, value, MAXLEN);
 		else if (strcmp(name, "promote_command") == 0)
 			strncpy(options->promote_command, value, MAXLEN);
 		else if (strcmp(name, "follow_command") == 0)
 			strncpy(options->follow_command, value, MAXLEN);
-		else if (strcmp(name, "service_stop_command") == 0)
-			strncpy(options->service_stop_command, value, MAXLEN);
-		else if (strcmp(name, "service_start_command") == 0)
-			strncpy(options->service_start_command, value, MAXLEN);
-		else if (strcmp(name, "service_restart_command") == 0)
-			strncpy(options->service_restart_command, value, MAXLEN);
-		else if (strcmp(name, "service_reload_command") == 0)
-			strncpy(options->service_reload_command, value, MAXLEN);
-		else if (strcmp(name, "service_promote_command") == 0)
-			strncpy(options->service_promote_command, value, MAXLEN);
 		else if (strcmp(name, "master_response_timeout") == 0)
-			options->master_response_timeout = repmgr_atoi(value, "master_response_timeout", error_list, false);
-		/*
-		 * 'primary_response_timeout' as synonym for 'master_response_timeout' -
+			options->master_response_timeout = repmgr_atoi(value, "master_response_timeout", &config_errors);
+		/* 'primary_response_timeout' as synonym for 'master_response_timeout' -
 		 * we'll switch terminology in a future release (3.1?)
 		 */
 		else if (strcmp(name, "primary_response_timeout") == 0)
-			options->master_response_timeout = repmgr_atoi(value, "primary_response_timeout", error_list, false);
+			options->master_response_timeout = repmgr_atoi(value, "primary_response_timeout", &config_errors);
 		else if (strcmp(name, "reconnect_attempts") == 0)
-			options->reconnect_attempts = repmgr_atoi(value, "reconnect_attempts", error_list, false);
+			options->reconnect_attempts = repmgr_atoi(value, "reconnect_attempts", &config_errors);
 		else if (strcmp(name, "reconnect_interval") == 0)
-			options->reconnect_interval = repmgr_atoi(value, "reconnect_interval", error_list, false);
+			options->reconnect_interval = repmgr_atoi(value, "reconnect_interval", &config_errors);
 		else if (strcmp(name, "pg_bindir") == 0)
 			strncpy(options->pg_bindir, value, MAXLEN);
 		else if (strcmp(name, "pg_ctl_options") == 0)
@@ -398,22 +350,18 @@ _parse_config(t_configuration_options *options, ItemList *error_list)
 		else if (strcmp(name, "logfile") == 0)
 			strncpy(options->logfile, value, MAXLEN);
 		else if (strcmp(name, "monitor_interval_secs") == 0)
-			options->monitor_interval_secs = repmgr_atoi(value, "monitor_interval_secs", error_list, false);
+			options->monitor_interval_secs = repmgr_atoi(value, "monitor_interval_secs", &config_errors);
 		else if (strcmp(name, "retry_promote_interval_secs") == 0)
-			options->retry_promote_interval_secs = repmgr_atoi(value, "retry_promote_interval_secs", error_list, false);
-		else if (strcmp(name, "witness_repl_nodes_sync_interval_secs") == 0)
-			options->witness_repl_nodes_sync_interval_secs = repmgr_atoi(value, "witness_repl_nodes_sync_interval_secs", error_list, false);
+			options->retry_promote_interval_secs = repmgr_atoi(value, "retry_promote_interval_secs", &config_errors);
 		else if (strcmp(name, "use_replication_slots") == 0)
 			/* XXX we should have a dedicated boolean argument format */
-			options->use_replication_slots = repmgr_atoi(value, "use_replication_slots", error_list, false);
+			options->use_replication_slots = repmgr_atoi(value, "use_replication_slots", &config_errors);
 		else if (strcmp(name, "event_notification_command") == 0)
 			strncpy(options->event_notification_command, value, MAXLEN);
 		else if (strcmp(name, "event_notifications") == 0)
 			parse_event_notifications_list(options, value);
 		else if (strcmp(name, "tablespace_mapping") == 0)
 			tablespace_list_append(options, value);
-		else if (strcmp(name, "restore_command") == 0)
-			strncpy(options->restore_command, value, MAXLEN);
 		else
 		{
 			known_parameter = false;
@@ -433,27 +381,35 @@ _parse_config(t_configuration_options *options, ItemList *error_list)
 					 _("no value provided for parameter \"%s\""),
 					 name);

-			item_list_append(error_list, error_message_buf);
+			error_list_append(&config_errors, error_message_buf);
 		}
 	}

 	fclose(fp);

+	/* Check config settings */

-	if (node_found == false)
+	/* The following checks are for the presence of the parameter */
+	if (*options->cluster_name == '\0')
 	{
-		item_list_append(error_list, _("\"node\": parameter was not found"));
-	}
-	else if (options->node == 0)
-	{
-		item_list_append(error_list, _("\"node\": must be greater than zero"));
-	}
-	else if (options->node < 0)
-	{
-		item_list_append(error_list, _("\"node\": must be a positive signed 32 bit integer, i.e. 2147483647 or less"));
+		error_list_append(&config_errors, _("\"cluster\": parameter was not found\n"));
 	}

-	if (strlen(options->conninfo))
+	if (options->node == -1)
+	{
+		error_list_append(&config_errors, _("\"node\": parameter was not found\n"));
+	}
+
+	if (*options->node_name == '\0')
+	{
+		error_list_append(&config_errors, _("\"node_name\": parameter was not found\n"));
+	}
+
+	if (*options->conninfo == '\0')
+	{
+		error_list_append(&config_errors, _("\"conninfo\": parameter was not found\n"));
+	}
+	else
 	{

 		/* Sanity check the provided conninfo string
@@ -470,11 +426,18 @@ _parse_config(t_configuration_options *options, ItemList *error_list)
 					 _("\"conninfo\": %s"),
 					 conninfo_errmsg);

-			item_list_append(error_list, error_message_buf);
+			error_list_append(&config_errors, error_message_buf);
 		}

 		PQconninfoFree(conninfo_options);
 	}
+
+	if (config_errors.head != NULL)
+	{
+		exit_with_errors(&config_errors);
+	}
+
+	return true;
 }


@@ -564,85 +527,70 @@ parse_line(char *buf, char *name, char *value)
 	trim(value);
 }

-
-/*
- * reload_config()
- *
- * This is only called by repmgrd after receiving a SIGHUP or when a monitoring
- * loop is started up; it therefore only needs to reload options required
- * by repmgrd, which are as follows:
- *
- * changeable options:
- * - failover
- * - follow_command
- * - logfacility
- * - logfile
- * - loglevel
- * - master_response_timeout
- * - monitor_interval_secs
- * - priority
- * - promote_command
- * - reconnect_attempts
- * - reconnect_interval
- * - retry_promote_interval_secs
- * - witness_repl_nodes_sync_interval_secs
- *
- * non-changeable options:
- * - cluster_name
- * - conninfo
- * - node
- * - node_name
- *
- * extract with something like:
- *	 grep local_options\\. repmgrd.c | perl -n -e '/local_options\.([\w_]+)/ && print qq|$1\n|;' | sort | uniq
-
- */
 bool
 reload_config(t_configuration_options *orig_options)
 {
 	PGconn	   *conn;
-	t_configuration_options new_options = T_CONFIGURATION_OPTIONS_INITIALIZER;
+	t_configuration_options new_options;
 	bool	  config_changed = false;
-	bool	  log_config_changed = false;
-
-	static ItemList config_errors = { NULL, NULL };

 	/*
 	 * Re-read the configuration file: repmgr.conf
 	 */
-	log_info(_("reloading configuration file\n"));
+	log_info(_("reloading configuration file and updating repmgr tables\n"));

-	_parse_config(&new_options, &config_errors);
-
-	if (config_errors.head != NULL)
+	parse_config(&new_options);
+	if (new_options.node == -1)
 	{
-		/* XXX dump errors to log */
 		log_warning(_("unable to parse new configuration, retaining current configuration\n"));
 		return false;
 	}

-	/* The following options cannot be changed */
 	if (strcmp(new_options.cluster_name, orig_options->cluster_name) != 0)
 	{
-		log_warning(_("cluster_name cannot be changed, retaining current configuration\n"));
+		log_warning(_("unable to change cluster name, retaining current configuration\n"));
 		return false;
 	}

 	if (new_options.node != orig_options->node)
 	{
-		log_warning(_("node ID cannot be changed, retaining current configuration\n"));
+		log_warning(_("unable to change node ID, retaining current configuration\n"));
 		return false;
 	}

 	if (strcmp(new_options.node_name, orig_options->node_name) != 0)
 	{
-		log_warning(_("node_name cannot be changed, keeping current configuration\n"));
+		log_warning(_("unable to change standby name, keeping current configuration\n"));
+		return false;
+	}
+
+	if (new_options.failover != MANUAL_FAILOVER && new_options.failover != AUTOMATIC_FAILOVER)
+	{
+		log_warning(_("new value for 'failover' must be 'automatic' or 'manual'\n"));
+		return false;
+	}
+
+	if (new_options.master_response_timeout <= 0)
+	{
+		log_warning(_("new value for 'master_response_timeout' must be greater than zero\n"));
+		return false;
+	}
+
+	if (new_options.reconnect_attempts < 0)
+	{
+		log_warning(_("new value for 'reconnect_attempts' must be zero or greater\n"));
+		return false;
+	}
+
+	if (new_options.reconnect_interval < 0)
+	{
+		log_warning(_("new value for 'reconnect_interval' must be zero or greater\n"));
 		return false;
 	}

 	if (strcmp(orig_options->conninfo, new_options.conninfo) != 0)
 	{
-		/* Test conninfo string works*/
+		/* Test conninfo string */
 		conn = establish_db_connection(new_options.conninfo, false);
 		if (!conn || (PQstatus(conn) != CONNECTION_OK))
 		{
@@ -659,6 +607,27 @@ reload_config(t_configuration_options *orig_options)
 	 * to manage them
 	 */

+	/* cluster_name */
+	if (strcmp(orig_options->cluster_name, new_options.cluster_name) != 0)
+	{
+		strcpy(orig_options->cluster_name, new_options.cluster_name);
+		config_changed = true;
+	}
+
+	/* conninfo */
+	if (strcmp(orig_options->conninfo, new_options.conninfo) != 0)
+	{
+		strcpy(orig_options->conninfo, new_options.conninfo);
+		config_changed = true;
+	}
+
+	/* node */
+	if (orig_options->node != new_options.node)
+	{
+		orig_options->node = new_options.node;
+		config_changed = true;
+	}
+
 	/* failover */
 	if (orig_options->failover != new_options.failover)
 	{
@@ -666,27 +635,6 @@ reload_config(t_configuration_options *orig_options)
 		config_changed = true;
 	}

-	/* follow_command */
-	if (strcmp(orig_options->follow_command, new_options.follow_command) != 0)
-	{
-		strcpy(orig_options->follow_command, new_options.follow_command);
-		config_changed = true;
-	}
-
-	/* master_response_timeout */
-	if (orig_options->master_response_timeout != new_options.master_response_timeout)
-	{
-		orig_options->master_response_timeout = new_options.master_response_timeout;
-		config_changed = true;
-	}
-
-	/* monitor_interval_secs */
-	if (orig_options->monitor_interval_secs != new_options.monitor_interval_secs)
-	{
-		orig_options->monitor_interval_secs = new_options.monitor_interval_secs;
-		config_changed = true;
-	}
-
 	/* priority */
 	if (orig_options->priority != new_options.priority)
 	{
@@ -694,6 +642,13 @@ reload_config(t_configuration_options *orig_options)
 		config_changed = true;
 	}

+	/* node_name */
+	if (strcmp(orig_options->node_name, new_options.node_name) != 0)
+	{
+		strcpy(orig_options->node_name, new_options.node_name);
+		config_changed = true;
+	}
+
 	/* promote_command */
 	if (strcmp(orig_options->promote_command, new_options.promote_command) != 0)
 	{
@@ -701,6 +656,44 @@ reload_config(t_configuration_options *orig_options)
 		config_changed = true;
 	}

+	/* follow_command */
+	if (strcmp(orig_options->follow_command, new_options.follow_command) != 0)
+	{
+		strcpy(orig_options->follow_command, new_options.follow_command);
+		config_changed = true;
+	}
+
+	/*
+	 * XXX These ones can change with a simple SIGHUP?
+	 *
+	 * strcpy (orig_options->loglevel, new_options.loglevel); strcpy
+	 * (orig_options->logfacility, new_options.logfacility);
+	 *
+	 * logger_shutdown(); XXX do we have progname here ? logger_init(progname,
+	 * orig_options.loglevel, orig_options.logfacility);
+	 */
+
+	/* rsync_options */
+	if (strcmp(orig_options->rsync_options, new_options.rsync_options) != 0)
+	{
+		strcpy(orig_options->rsync_options, new_options.rsync_options);
+		config_changed = true;
+	}
+
+	/* ssh_options */
+	if (strcmp(orig_options->ssh_options, new_options.ssh_options) != 0)
+	{
+		strcpy(orig_options->ssh_options, new_options.ssh_options);
+		config_changed = true;
+	}
+
+	/* master_response_timeout */
+	if (orig_options->master_response_timeout != new_options.master_response_timeout)
+	{
+		orig_options->master_response_timeout = new_options.master_response_timeout;
+		config_changed = true;
+	}
+
 	/* reconnect_attempts */
 	if (orig_options->reconnect_attempts != new_options.reconnect_attempts)
 	{
@@ -715,6 +708,27 @@ reload_config(t_configuration_options *orig_options)
 		config_changed = true;
 	}

+	/* pg_ctl_options */
+	if (strcmp(orig_options->pg_ctl_options, new_options.pg_ctl_options) != 0)
+	{
+		strcpy(orig_options->pg_ctl_options, new_options.pg_ctl_options);
+		config_changed = true;
+	}
+
+	/* pg_basebackup_options */
+	if (strcmp(orig_options->pg_basebackup_options, new_options.pg_basebackup_options) != 0)
+	{
+		strcpy(orig_options->pg_basebackup_options, new_options.pg_basebackup_options);
+		config_changed = true;
+	}
+
+	/* monitor_interval_secs */
+	if (orig_options->monitor_interval_secs != new_options.monitor_interval_secs)
+	{
+		orig_options->monitor_interval_secs = new_options.monitor_interval_secs;
+		config_changed = true;
+	}
+
 	/* retry_promote_interval_secs */
 	if (orig_options->retry_promote_interval_secs != new_options.retry_promote_interval_secs)
 	{
@@ -722,54 +736,20 @@ reload_config(t_configuration_options *orig_options)
 		config_changed = true;
 	}

-
-	/* witness_repl_nodes_sync_interval_secs */
-	if (orig_options->witness_repl_nodes_sync_interval_secs != new_options.witness_repl_nodes_sync_interval_secs)
+	/* use_replication_slots */
+	if (orig_options->use_replication_slots != new_options.use_replication_slots)
 	{
-		orig_options->witness_repl_nodes_sync_interval_secs = new_options.witness_repl_nodes_sync_interval_secs;
+		orig_options->use_replication_slots = new_options.use_replication_slots;
 		config_changed = true;
 	}

-	/*
-	 * Handle changes to logging configuration
-	 */
-	if (strcmp(orig_options->logfacility, new_options.logfacility) != 0)
-	{
-		strcpy(orig_options->logfacility, new_options.logfacility);
-		log_config_changed = true;
-	}
-
-	if (strcmp(orig_options->logfile, new_options.logfile) != 0)
-	{
-		strcpy(orig_options->logfile, new_options.logfile);
-		log_config_changed = true;
-	}
-
-
-	if (strcmp(orig_options->loglevel, new_options.loglevel) != 0)
-	{
-		strcpy(orig_options->loglevel, new_options.loglevel);
-		log_config_changed = true;
-	}
-
-	if (log_config_changed == true)
-	{
-		log_notice(_("restarting logging with changed parameters\n"));
-		logger_shutdown();
-		logger_init(orig_options, progname());
-	}
-
 	if (config_changed == true)
 	{
-		log_notice(_("configuration file reloaded with changed parameters\n"));
+		log_debug(_("reload_config(): configuration has changed\n"));
 	}
-	/*
-	 * if logging configuration changed, don't say the configuration didn't
-	 * change, as it clearly has.
-	 */
-	else if (log_config_changed == false)
+	else
 	{
-		log_info(_("configuration has not changed\n"));
+		log_debug(_("reload_config(): configuration has not changed\n"));
 	}

 	return config_changed;
@@ -777,11 +757,11 @@ reload_config(t_configuration_options *orig_options)


 void
-item_list_append(ItemList *item_list, char *error_message)
+error_list_append(ErrorList *error_list, char *error_message)
 {
-	ItemListCell *cell;
+	ErrorListCell *cell;

-	cell = (ItemListCell *) pg_malloc0(sizeof(ItemListCell));
+	cell = (ErrorListCell *) pg_malloc0(sizeof(ErrorListCell));

 	if (cell == NULL)
 	{
@@ -789,19 +769,19 @@ item_list_append(ItemList *item_list, char *error_message)
 		exit(ERR_BAD_CONFIG);
 	}

-	cell->string = pg_malloc0(MAXLEN);
-	strncpy(cell->string, error_message, MAXLEN);
+	cell->error_message = pg_malloc0(MAXLEN);
+	strncpy(cell->error_message, error_message, MAXLEN);

-	if (item_list->tail)
+	if (error_list->tail)
 	{
-		item_list->tail->next = cell;
+		error_list->tail->next = cell;
 	}
 	else
 	{
-		item_list->head = cell;
+		error_list->head = cell;
 	}

-	item_list->tail = cell;
+	error_list->tail = cell;
 }


@@ -811,7 +791,7 @@ item_list_append(ItemList *item_list, char *error_message)
 * otherwise exit
 */
 int
-repmgr_atoi(const char *value, const char *config_item, ItemList *error_list, bool allow_negative)
+repmgr_atoi(const char *value, const char *config_item, ErrorList *error_list)
 {
 	char	  *endptr;
 	long	   longval = 0;
@@ -842,8 +822,8 @@ repmgr_atoi(const char *value, const char *config_item, ItemList *error_list, bo
 		}
 	}

-	/* Disallow negative values for most parameters */
-	if (allow_negative == false && longval < 0)
+	/* Currently there are no values which could be negative */
+	if (longval < 0)
 	{
 		snprintf(error_message_buf,
 				 MAXLEN,
@@ -860,7 +840,7 @@ repmgr_atoi(const char *value, const char *config_item, ItemList *error_list, bo
 			exit(ERR_BAD_CONFIG);
 		}

-		item_list_append(error_list, error_message_buf);
+		error_list_append(error_list, error_message_buf);
 	}

 	return (int32) longval;
@@ -943,7 +923,7 @@ static void
 parse_event_notifications_list(t_configuration_options *options, const char *arg)
 {
 	const char *arg_ptr;
-	char		event_type_buf[MAXLEN] = "";
+	char	    event_type_buf[MAXLEN] = "";
 	char	   *dst_ptr = event_type_buf;


@@ -1002,15 +982,15 @@ parse_event_notifications_list(t_configuration_options *options, const char *arg


 static void
-exit_with_errors(ItemList *config_errors)
+exit_with_errors(ErrorList *config_errors)
 {
-	ItemListCell *cell;
+	ErrorListCell *cell;

 	log_err(_("%s: following errors were found in the configuration file.\n"), progname());

 	for (cell = config_errors->head; cell; cell = cell->next)
 	{
-		log_err("%s\n", cell->string);
+		log_err("%s\n", cell->error_message);
 	}

 	exit(ERR_BAD_CONFIG);
--- a/config.h
+++ b/config.h
@@ -1,7 +1,6 @@
 /*
 * config.h
- *
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2016
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -58,20 +57,11 @@ typedef struct
 	int			node;
 	int         upstream_node;
 	char		conninfo[MAXLEN];
-	char		barman_server[MAXLEN];
-	char		barman_config[MAXLEN];
 	int			failover;
 	int			priority;
 	char		node_name[MAXLEN];
-	/* commands executed by repmgrd */
 	char		promote_command[MAXLEN];
 	char		follow_command[MAXLEN];
-	/* Overrides for pg_ctl commands */
-	char		service_stop_command[MAXLEN];
-	char		service_start_command[MAXLEN];
-	char		service_restart_command[MAXLEN];
-	char		service_reload_command[MAXLEN];
-	char		service_promote_command[MAXLEN];
 	char		loglevel[MAXLEN];
 	char		logfacility[MAXLEN];
 	char		rsync_options[QUERY_STR_LEN];
@@ -82,66 +72,40 @@ typedef struct
 	char		pg_bindir[MAXLEN];
 	char		pg_ctl_options[MAXLEN];
 	char		pg_basebackup_options[MAXLEN];
-	char		restore_command[MAXLEN];
 	char		logfile[MAXLEN];
 	int			monitor_interval_secs;
 	int			retry_promote_interval_secs;
-	int			witness_repl_nodes_sync_interval_secs;
 	int			use_replication_slots;
 	char		event_notification_command[MAXLEN];
 	EventNotificationList event_notifications;
 	TablespaceList tablespace_mapping;
 }	t_configuration_options;

-/*
- * The following will initialize the structure with a minimal set of options;
- * actual defaults are set in parse_config() before parsing the configuration file
- */
-#define T_CONFIGURATION_OPTIONS_INITIALIZER { "", UNKNOWN_NODE_ID, NO_UPSTREAM_NODE, "", "", "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", "", "", "", "", "", "", -1, -1, -1, "", "", "", "", "", 0, 0, 0, 0, "", { NULL, NULL }, { NULL, NULL } }
+#define T_CONFIGURATION_OPTIONS_INITIALIZER { "", -1, NO_UPSTREAM_NODE, "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", "", -1, -1, -1, "", "", "", "", 0, 0, 0, "", { NULL, NULL }, {NULL, NULL} }

-typedef struct ItemListCell
+typedef struct ErrorListCell
 {
-	struct ItemListCell *next;
-	char			    *string;
-} ItemListCell;
+	struct ErrorListCell *next;
+	char			     *error_message;
+} ErrorListCell;

-typedef struct ItemList
+typedef struct ErrorList
 {
-	ItemListCell *head;
-	ItemListCell *tail;
-} ItemList;
-
-typedef struct TablespaceDataListCell
-{
-	struct TablespaceDataListCell *next;
-	char	   *name;
-	char	   *oid;
-	char	   *location;
-	/* optional payload */
-	FILE       *f;
-} TablespaceDataListCell;
-
-typedef struct TablespaceDataList
-{
-	TablespaceDataListCell *head;
-	TablespaceDataListCell *tail;
-} TablespaceDataList;
+	ErrorListCell *head;
+	ErrorListCell *tail;
+} ErrorList;

 void set_progname(const char *argv0);
 const char * progname(void);

 bool		load_config(const char *config_file, bool verbose, t_configuration_options *options, char *argv0);
-
-void		_parse_config(t_configuration_options *options, ItemList *error_list);
-bool		parse_config(t_configuration_options *options);
 bool		reload_config(t_configuration_options *orig_options);
-
+bool		parse_config(t_configuration_options *options);
 void		parse_line(char *buff, char *name, char *value);
 char	   *trim(char *s);
-void		item_list_append(ItemList *item_list, char *error_message);
+void		error_list_append(ErrorList *error_list, char *error_message);
 int			repmgr_atoi(const char *s,
 						const char *config_item,
-						ItemList *error_list,
-						bool allow_negative);
-extern bool		config_file_found;
+						ErrorList *error_list);
+
 #endif
--- a/dbutils.c
+++ b/dbutils.c
--- a/dbutils.h
+++ b/dbutils.h
@@ -1,7 +1,6 @@
 /*
 * dbutils.h
- *
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2016
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -22,7 +21,6 @@
 #define _REPMGR_DBUTILS_H_

 #include "access/xlogdefs.h"
-#include "pqexpbuffer.h"

 #include "config.h"
 #include "strutil.h"
@@ -68,27 +66,8 @@ typedef struct s_node_info
  InvalidXLogRecPtr \
 }

-/*
- * Struct to store replication slot information
- */
-
-typedef struct s_replication_slot
-{
-	char slot_name[MAXLEN];
-    char slot_type[MAXLEN];
-	bool active;
-}   t_replication_slot;
-
-extern char		repmgr_schema[MAXLEN];
-
-PGconn *_establish_db_connection(const char *conninfo,
-								 const bool exit_on_error,
-								 const bool log_notice,
-								 const bool verbose_only);
 PGconn *establish_db_connection(const char *conninfo,
-								const bool exit_on_error);
-PGconn *establish_db_connection_quiet(const char *conninfo);
-PGconn *test_db_connection(const char *conninfo);
+						const bool exit_on_error);
 PGconn *establish_db_connection_by_params(const char *keywords[],
 								  const char *values[],
 								  const bool exit_on_error);
@@ -107,7 +86,7 @@ int			guc_set(PGconn *conn, const char *parameter, const char *op,
 			const char *value);
 int			guc_set_typed(PGconn *conn, const char *parameter, const char *op,
 			  const char *value, const char *datatype);
-bool		get_conninfo_value(const char *conninfo, const char *keyword, char *output);
+
 PGconn     *get_upstream_connection(PGconn *standby_conn, char *cluster,
 									int node_id,
 									int *upstream_node_id_ptr,
@@ -119,25 +98,18 @@ int			wait_connection_availability(PGconn *conn, long long timeout);
 bool		cancel_query(PGconn *conn, int timeout);
 char       *get_repmgr_schema(void);
 char       *get_repmgr_schema_quoted(PGconn *conn);
-bool		create_replication_slot(PGconn *conn, char *slot_name, int server_version_num, PQExpBufferData *error_msg);
-int			get_slot_record(PGconn *conn, char *slot_name, t_replication_slot *record);
+bool		create_replication_slot(PGconn *conn, char *slot_name);
 bool		drop_replication_slot(PGconn *conn, char *slot_name);
-bool		start_backup(PGconn *conn, char *first_wal_segment, bool fast_checkpoint, int server_version_num);
-bool		stop_backup(PGconn *conn, char *last_wal_segment, int server_version_num);
-bool		set_config(PGconn *conn, const char *config_param,  const char *config_value);
+
+bool		start_backup(PGconn *conn, char *first_wal_segment, bool fast_checkpoint);
+bool		stop_backup(PGconn *conn, char *last_wal_segment);
 bool		set_config_bool(PGconn *conn, const char *config_param, bool state);
-bool		witness_copy_node_records(PGconn *masterconn, PGconn *witnessconn, char *cluster_name);
-bool		create_node_record(PGconn *conn, char *action, int node, char *type, int upstream_node, char *cluster_name, char *node_name, char *conninfo, int priority, char *slot_name, bool active);
+bool		copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name);
+bool		create_node_record(PGconn *conn, char *action, int node, char *type, int upstream_node, char *cluster_name, char *node_name, char *conninfo, int priority, char *slot_name);
 bool		delete_node_record(PGconn *conn, int node, char *action);
-int			get_node_record(PGconn *conn, char *cluster, int node_id, t_node_info *node_info);
-int			get_node_record_by_name(PGconn *conn, char *cluster, const char *node_name, t_node_info *node_info);
-bool        update_node_record(PGconn *conn, char *action, int node, char *type, int upstream_node, char *cluster_name, char *node_name, char *conninfo, int priority, char *slot_name, bool active);
+bool        create_event_record(PGconn *conn, t_configuration_options *options, int node_id, char *event, bool successful, char *details);
 bool        update_node_record_status(PGconn *conn, char *cluster_name, int this_node_id, char *type, int upstream_node_id, bool active);
 bool        update_node_record_set_upstream(PGconn *conn, char *cluster_name, int this_node_id, int new_upstream_node_id);
-bool        create_event_record(PGconn *conn, t_configuration_options *options, int node_id, char *event, bool successful, char *details);
+PGresult *	get_node_record(PGconn *conn, char *cluster, int node_id);

-int		    get_node_replication_state(PGconn *conn, char *node_name, char *output);
-t_server_type parse_node_type(const char *type);
-int			get_data_checksum_version(const char *data_directory);
 #endif
-
--- a/debian/DEBIAN/control
+++ b/debian/DEBIAN/control
@@ -1,9 +1,9 @@
 Package: repmgr-auto
-Version: 3.2dev
+Version: 2.0beta2
 Section: database
 Priority: optional
 Architecture: all
-Depends: rsync, postgresql-9.3 | postgresql-9.4 | postgresql-9.5
-Maintainer: Self built package <user@localhost>
+Depends: rsync, postgresql-9.0 | postgresql-9.1 | postgresql-9.2 | postgresql-9.3 | postgresql-9.4
+Maintainer: Jaime Casanova <jaime@2ndQuadrant.com>
 Description: PostgreSQL replication setup, magament and monitoring
 has two main executables
--- a/dirmod.c
+++ b/dirmod.c
@@ -1,194 +0,0 @@
-/*
- *
- * dirmod.c
- *	  directory handling functions
- *
- * Copyright (c) 2ndQuadrant, 2010-2017
- *
- * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "postgres_fe.h"
-
-/* Don't modify declarations in system headers */
-
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/stat.h>
-
-/*
- * pgfnames
- *
- * return a list of the names of objects in the argument directory.  Caller
- * must call pgfnames_cleanup later to free the memory allocated by this
- * function.
- */
-char	  **
-pgfnames(const char *path)
-{
-	DIR		   *dir;
-	struct dirent *file;
-	char	  **filenames;
-	int			numnames = 0;
-	int			fnsize = 200;	/* enough for many small dbs */
-
-	dir = opendir(path);
-	if (dir == NULL)
-	{
-		return NULL;
-	}
-
-	filenames = (char **) palloc(fnsize * sizeof(char *));
-
-	while (errno = 0, (file = readdir(dir)) != NULL)
-	{
-		if (strcmp(file->d_name, ".") != 0 && strcmp(file->d_name, "..") != 0)
-		{
-			if (numnames + 1 >= fnsize)
-			{
-				fnsize *= 2;
-				filenames = (char **) repalloc(filenames,
-											   fnsize * sizeof(char *));
-			}
-			filenames[numnames++] = pstrdup(file->d_name);
-		}
-	}
-
-	if (errno)
-	{
-		fprintf(stderr, _("could not read directory \"%s\": %s\n"),
-				path, strerror(errno));
-	}
-
-	filenames[numnames] = NULL;
-
-	if (closedir(dir))
-	{
-		fprintf(stderr, _("could not close directory \"%s\": %s\n"),
-				path, strerror(errno));
-	}
-
-	return filenames;
-}
-
-
-/*
- *	pgfnames_cleanup
- *
- *	deallocate memory used for filenames
- */
-void
-pgfnames_cleanup(char **filenames)
-{
-	char	  **fn;
-
-	for (fn = filenames; *fn; fn++)
-		pfree(*fn);
-
-	pfree(filenames);
-}
-
-
-/*
- *	rmtree
- *
- *	Delete a directory tree recursively.
- *	Assumes path points to a valid directory.
- *	Deletes everything under path.
- *	If rmtopdir is true deletes the directory too.
- *	Returns true if successful, false if there was any problem.
- *	(The details of the problem are reported already, so caller
- *	doesn't really have to say anything more, but most do.)
- */
-bool
-rmtree(const char *path, bool rmtopdir)
-{
-	bool		result = true;
-	char		pathbuf[MAXPGPATH];
-	char	  **filenames;
-	char	  **filename;
-	struct stat statbuf;
-
-	/*
-	 * we copy all the names out of the directory before we start modifying
-	 * it.
-	 */
-	filenames = pgfnames(path);
-
-	if (filenames == NULL)
-		return false;
-
-	/* now we have the names we can start removing things */
-	for (filename = filenames; *filename; filename++)
-	{
-		snprintf(pathbuf, MAXPGPATH, "%s/%s", path, *filename);
-
-		/*
-		 * It's ok if the file is not there anymore; we were just about to
-		 * delete it anyway.
-		 *
-		 * This is not an academic possibility. One scenario where this
-		 * happens is when bgwriter has a pending unlink request for a file in
-		 * a database that's being dropped. In dropdb(), we call
-		 * ForgetDatabaseFsyncRequests() to flush out any such pending unlink
-		 * requests, but because that's asynchronous, it's not guaranteed that
-		 * the bgwriter receives the message in time.
-		 */
-		if (lstat(pathbuf, &statbuf) != 0)
-		{
-			if (errno != ENOENT)
-			{
-				result = false;
-			}
-			continue;
-		}
-
-		if (S_ISDIR(statbuf.st_mode))
-		{
-			/* call ourselves recursively for a directory */
-			if (!rmtree(pathbuf, true))
-			{
-				/* we already reported the error */
-				result = false;
-			}
-		}
-		else
-		{
-			if (unlink(pathbuf) != 0)
-			{
-				if (errno != ENOENT)
-				{
-					result = false;
-				}
-			}
-		}
-	}
-
-	if (rmtopdir)
-	{
-		if (rmdir(path) != 0)
-		{
-			result = false;
-		}
-	}
-
-	pgfnames_cleanup(filenames);
-
-	return result;
-}
-
--- a/dirmod.h
+++ b/dirmod.h
@@ -1,23 +0,0 @@
-/*
- * dirmod.h
- * Copyright (c) 2ndQuadrant, 2010-2017
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef _DIRMOD_H_
-#define _DIRMOD_H_
-
-#endif
--- a/docs/repmgrd-failover-mechanism.md
+++ b/docs/repmgrd-failover-mechanism.md
@@ -1,75 +0,0 @@
-repmgrd's failover algorithm
-============================
-
-When implementing automatic failover, there are two factors which are critical in
-ensuring the desired result is achieved:
-
-  - has the master node genuinely failed?
-  - which is the best node to promote to the new master?
-
-This document outlines repmgrd's decision-making process during automatic failover
-for standbys directly connected to the master node.
-
-
-Master node failure detection
-----------------------------
-
-If a `repmgrd` instance running on a PostgreSQL standby node is unable to connect to
-the master node, this doesn't neccesarily mean that the master is down and a
-failover is required. Factors such as network connectivity issues could mean that
-even though the standby node is isolated, the replication cluster as a whole
-is functioning correctly, and promoting the standby without further verification
-could result in a "split-brain" situation.
-
-In the event that `repmgrd` is unable to connect to the master node, it will attempt
-to reconnect to the master server several times (as defined by the `reconnect_attempts`
-parameter in `repmgr.conf`), with reconnection attempts  occuring at the interval
-specified by `reconnect_interval`. This happens to verify that the master is definitively
-not accessible (e.g. that connection was not lost due to a brief network glitch).
-
-Appropriate values for these settings will depend very much on the replication
-cluster environment. There will necessarily be a trade-off between the time it
-takes to assume the master is not reachable, and the reliability of that conclusion.
-A standby in a different physical location to the master will probably need a longer
-check interval to rule out possible network issues, whereas one located in the same
-rack with a direct connection between servers could perform the check very quickly.
-
-Note that it's possible the master comes back online after this point is reached,
-but before a new master has been selected; in this case it will be noticed
-during the selection of a new master and no actual failover will take place.
-
-Promotion candidate selection
-----------------------------
-
-Once `repmgrd` has decided the master is definitively unreachable, following checks
-will be carried out:
-
-* attempts to connect to all other nodes in the cluster (including the witness
-  node, if defined) to establish the state of the cluster, including their
-  current LSN
-
-* If less than half of the nodes are visible (from the viewpoint
-  of this node), `repmgrd` will not take any further action. This is to ensure that
-  e.g. if a replication cluster is spread over multiple data centres, a split-brain
-  situation does not occur if there is a network failure between datacentres. Note
-  that if nodes are split evenly between data centres, a witness server can be
-  used to establish the "majority" data centre.
-
-* `repmgrd` polls all visible servers and waits for each node to return a valid LSN;
-  it updates the LSN previously  stored for this node if it has increased since
-  the initial check
-
-* once all LSNs have been retrieved, `repmgrd` will check for the highest LSN; if
-  its own node has the highest LSN, it will attempt to promote itself (using the
-  command defined in `promote_command` in `repmgr.conf`. Note that if using
-  `repmgr standby promote` as the promotion command, and the original master becomes available
-  before the promotion takes effect, `repmgr` will return an error and no promotion
-  will take place, and `repmgrd` will resume monitoring as usual.
-
-* if the node is not the promotion candidate, `repmgrd` will execute the
-  `follow_command` defined in `repmgr.conf`. If using `repmgr standby follow` here,
-  `repmgr` will attempt to detect the new master node and attach to that.
-
-
-
-
--- a/docs/repmgrd-node-fencing.md
+++ b/docs/repmgrd-node-fencing.md
@@ -1,152 +0,0 @@
-Fencing a failed master node with repmgrd and pgbouncer
-=======================================================
-
-With automatic failover, it's essential to ensure that a failed master
-remains inaccessible to your application, even if it comes back online
-again, to avoid a split-brain situation.
-
-By using `pgbouncer` together with `repmgrd`, it's possible to combine
-automatic failover with a process to isolate the failed master from
-your application and ensure that all connections which should go to
-the master are directed there smoothly without having to reconfigure
-your application. (Note that as a connection pooler, `pgbouncer` can
-benefit your application in other ways, but those are beyond the scope
-of this document).
-
-* * *
-
-> *WARNING*: automatic failover is tricky to get right. This document
-> demonstrates one possible implementation method, however you should
-> carefully configure and test any setup to suit the needs of your own
-> replication cluster/application.
-
-* * *
-
-In a failover situation, `repmgrd` promotes a standby to master by executing
-the command defined in `promote_command`. Normally this would be something like:
-
-    repmgr standby promote -f /etc/repmgr.conf
-
-By wrapping this in a custom script which adjusts the `pgbouncer` configuration
-on all nodes, it's possible to fence the failed master and redirect write
-connections to the new master.
-
-The script consists of three sections:
-
-* commands to pause `pgbouncer` on all nodes
-* the promotion command itself
-* commands to reconfigure and restart `pgbouncer` on all nodes
-
-Note that it requires password-less SSH access between all nodes to be able to
-update the `pgbouncer` configuration files.
-
-For the purposes of this demonstration, we'll assume there are 3 nodes (master
-and two standbys), with `pgbouncer` listening on port 6432 handling connections
-to a database called `appdb`.  The `postgres` system user must have write
-access to the `pgbouncer` configuration files on all nodes. We'll assume
-there's a main `pgbouncer` configuration file, `/etc/pgbouncer.ini`, which uses
-the `%include` directive (available from PgBouncer 1.6) to include a separate
-configuration file, `/etc/pgbouncer.database.ini`, which will be modified by
-`repmgr`.
-
-`/etc/pgbouncer.ini` should look something like this:
-
-    [pgbouncer]
-
-    logfile = /var/log/pgbouncer/pgbouncer.log
-    pidfile = /var/run/pgbouncer/pgbouncer.pid
-
-    listen_addr = *
-    listen_port = 6532
-    unix_socket_dir = /tmp
-
-    auth_type = trust
-    auth_file = /etc/pgbouncer.auth
-
-    admin_users = postgres
-    stats_users = postgres
-
-    pool_mode = transaction
-
-    max_client_conn = 100
-    default_pool_size = 20
-    min_pool_size = 5
-    reserve_pool_size = 5
-    reserve_pool_timeout = 3
-
-    log_connections = 1
-    log_disconnections = 1
-    log_pooler_errors = 1
-
-    %include /etc/pgbouncer.database.ini
-
-The actual script is as follows; adjust the configurable items as appropriate:
-
-`/var/lib/postgres/repmgr/promote.sh`
-
-
-    #!/usr/bin/env bash
-    set -u
-    set -e
-
-    # Configurable items
-    PGBOUNCER_HOSTS="node1 node2 node3"
-    PGBOUNCER_DATABASE_INI="/etc/pgbouncer.database.ini"
-    PGBOUNCER_DATABASE="appdb"
-    PGBOUNCER_PORT=6432
-
-    REPMGR_DB="repmgr"
-    REPMGR_USER="repmgr"
-    REPMGR_SCHEMA="repmgr_test"
-
-    # 1. Pause running pgbouncer instances
-    for HOST in $PGBOUNCER_HOSTS
-    do
-        psql -t -c "pause" -h $HOST -p $PGBOUNCER_PORT -U postgres pgbouncer
-    done
-
-    # 2. Promote this node from standby to master
-
-    repmgr standby promote -f /etc/repmgr.conf
-
-    # 3. Reconfigure pgbouncer instances
-
-    PGBOUNCER_DATABASE_INI_NEW="/tmp/pgbouncer.database.ini"
-
-    for HOST in $PGBOUNCER_HOSTS
-    do
-        # Recreate the pgbouncer config file
-        echo -e "[databases]\n" > $PGBOUNCER_DATABASE_INI_NEW
-
-        psql -d $REPMGR_DB -U $REPMGR_USER -t -A \
-          -c "SELECT '${PGBOUNCER_DATABASE}-rw= ' || conninfo || ' application_name=pgbouncer_${HOST}' \
-              FROM ${REPMGR_SCHEMA}.repl_nodes \
-              WHERE active = TRUE AND type='master'" >> $PGBOUNCER_DATABASE_INI_NEW
-
-        psql -d $REPMGR_DB -U $REPMGR_USER -t -A \
-          -c "SELECT '${PGBOUNCER_DATABASE}-ro= ' || conninfo || ' application_name=pgbouncer_${HOST}' \
-              FROM $REPMGR_SCHEMA.repl_nodes \
-              WHERE node_name='${HOST}'" >> $PGBOUNCER_DATABASE_INI_NEW
-
-        rsync $PGBOUNCER_DATABASE_INI_NEW $HOST:$PGBOUNCER_DATABASE_INI
-
-        psql -tc "reload" -h $HOST -p $PGBOUNCER_PORT -U postgres pgbouncer
-        psql -tc "resume" -h $HOST -p $PGBOUNCER_PORT -U postgres pgbouncer
-
-    done
-
-    # Clean up generated file
-    rm $PGBOUNCER_DATABASE_INI_NEW
-
-    echo "Reconfiguration of pgbouncer complete"
-
-Script and template file should be installed on each node where
-`repmgrd` is running.
-
-Finally, set `promote_command` in `repmgr.conf` on each node to
-point to the custom promote script:
-
-    promote_command=/var/lib/postgres/repmgr/promote.sh
-
-and reload/restart any running `repmgrd` instances for the changes to take
-effect.
--- a/errcode.h
+++ b/errcode.h
@@ -1,6 +1,6 @@
 /*
 * errcode.h
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2016
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 #define ERR_DB_CON 6
 #define ERR_DB_QUERY 7
 #define ERR_PROMOTED 8
+#define ERR_BAD_PASSWORD 9
 #define ERR_STR_OVERFLOW 10
 #define ERR_FAILOVER_FAIL 11
 #define ERR_BAD_SSH 12
@@ -36,10 +37,5 @@
 #define ERR_BAD_BASEBACKUP 14
 #define ERR_INTERNAL 15
 #define ERR_MONITORING_FAIL 16
-#define ERR_BAD_BACKUP_LABEL 17
-#define ERR_SWITCHOVER_FAIL 18
-#define ERR_BARMAN 19
-#define ERR_REGISTRATION_SYNC 20
-

 #endif   /* _ERRCODE_H_ */
--- a/expected/repmgr_funcs.out
+++ b/expected/repmgr_funcs.out
@@ -1,18 +0,0 @@
-/*
- * repmgr_function.sql
- * Copyright (c) 2ndQuadrant, 2010-2017
- *
- */
-- SET SEARCH_PATH TO 'repmgr';
-CREATE FUNCTION repmgr_update_standby_location(text) RETURNS boolean
-AS '$libdir/repmgr_funcs', 'repmgr_update_standby_location'
-LANGUAGE C STRICT;
-CREATE FUNCTION repmgr_get_last_standby_location() RETURNS text
-AS '$libdir/repmgr_funcs', 'repmgr_get_last_standby_location'
-LANGUAGE C STRICT;
-CREATE FUNCTION repmgr_update_last_updated() RETURNS TIMESTAMP WITH TIME ZONE
-AS '$libdir/repmgr_funcs', 'repmgr_update_last_updated'
-LANGUAGE C STRICT;
-CREATE FUNCTION repmgr_get_last_updated() RETURNS TIMESTAMP WITH TIME ZONE
-AS '$libdir/repmgr_funcs', 'repmgr_get_last_updated'
-LANGUAGE C STRICT;
--- a/expected/repmgr_test.out
+++ b/expected/repmgr_test.out
@@ -1,24 +0,0 @@
-select * from repmgr_update_standby_location('');
- repmgr_update_standby_location 
--------------------------------
- f
-(1 row)
-
-select * from repmgr_get_last_standby_location();
- repmgr_get_last_standby_location 
----------------------------------
- 
-(1 row)
-
-select * from repmgr_update_last_updated();
- repmgr_update_last_updated 
----------------------------
- 
-(1 row)
-
-select * from repmgr_get_last_updated();
- repmgr_get_last_updated 
-------------------------
- 
-(1 row)
-
--- a/log.c
+++ b/log.c
@@ -1,6 +1,6 @@
 /*
 * log.c - Logging methods
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2016
 *
 * This module is a set of methods for logging (currently only syslog)
 *
@@ -40,21 +40,15 @@
 /* #define REPMGR_DEBUG */

 static int	detect_log_facility(const char *facility);
-static void _stderr_log_with_level(const char *level_name, int level, const char *fmt, va_list ap)
-__attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 0)));
+static void _stderr_log_with_level(const char *level_name, int level, const char *fmt, va_list ap);

 int			log_type = REPMGR_STDERR;
 int			log_level = LOG_NOTICE;
 int			last_log_level = LOG_NOTICE;
 int			verbose_logging = false;
 int			terse_logging = false;
-/*
- * Global variable to be set by the main application to ensure any log output
- * emitted before logger_init is called, is output in the correct format
- */
-int			logger_output_mode = OM_DAEMON;

-extern void
+void
 stderr_log_with_level(const char *level_name, int level, const char *fmt, ...)
 {
 	va_list		arglist;
@@ -67,31 +61,22 @@ stderr_log_with_level(const char *level_name, int level, const char *fmt, ...)
 static void
 _stderr_log_with_level(const char *level_name, int level, const char *fmt, va_list ap)
 {
-	char		buf[100];
+	time_t		t;
+	struct tm  *tm;
+	char		buff[100];

 	/*
 	 * Store the requested level so that if there's a subsequent
-	 * log_hint() or log_detail(), we can suppress that if appropriate.
+	 * log_hint(), we can suppress that if appropriate.
 	 */
 	last_log_level = level;

 	if (log_level >= level)
 	{
-
-		/* Format log line prefix with timestamp if in daemon mode */
-		if (logger_output_mode == OM_DAEMON)
-		{
-			time_t		t;
-			struct tm  *tm;
-			time(&t);
-			tm = localtime(&t);
-			strftime(buf, 100, "[%Y-%m-%d %H:%M:%S]", tm);
-			fprintf(stderr, "%s [%s] ", buf, level_name);
-		}
-		else
-		{
-			fprintf(stderr, "%s: ", level_name);
-		}
+		time(&t);
+		tm = localtime(&t);
+		strftime(buff, 100, "[%Y-%m-%d %H:%M:%S]", tm);
+		fprintf(stderr, "%s [%s] ", buff, level_name);

 		vfprintf(stderr, fmt, ap);

@@ -113,20 +98,6 @@ log_hint(const char *fmt, ...)
 }


-void
-log_detail(const char *fmt, ...)
-{
-	va_list		ap;
-
-	if (terse_logging == false)
-	{
-		va_start(ap, fmt);
-		_stderr_log_with_level("DETAIL", last_log_level, fmt, ap);
-		va_end(ap);
-	}
-}
-
-
 void
 log_verbose(int level, const char *fmt, ...)
 {
@@ -170,7 +141,7 @@ log_verbose(int level, const char *fmt, ...)


 bool
-logger_init(t_configuration_options *opts, const char *ident)
+logger_init(t_configuration_options * opts, const char *ident)
 {
 	char	   *level = opts->loglevel;
 	char	   *facility = opts->logfacility;
@@ -204,13 +175,6 @@ logger_init(t_configuration_options *opts, const char *ident)
 			stderr_log_warning(_("Invalid log level \"%s\" (available values: DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG)\n"), level);
 	}

-	/*
-	 * STDERR only logging requested - finish here without setting up any further
-	 * logging facility.
-	 */
-	if (logger_output_mode == OM_COMMAND_LINE)
-		return true;
-
 	if (facility && *facility)
 	{

@@ -271,10 +235,9 @@ logger_init(t_configuration_options *opts, const char *ident)
 		stderr_log_notice(_("Redirecting logging output to '%s'\n"), opts->logfile);
 		fd = freopen(opts->logfile, "a", stderr);

-		/*
-		 * It's possible freopen() may still fail due to e.g. a race condition;
-		 * as it's not feasible to restore stderr after a failed freopen(),
-		 * we'll write to stdout as a last resort.
+		/* It's possible freopen() may still fail due to e.g. a race condition;
+		   as it's not feasible to restore stderr after a failed freopen(),
+		   we'll write to stdout as a last resort.
 		 */
 		if (fd == NULL)
 		{
--- a/log.h
+++ b/log.h
@@ -1,6 +1,6 @@
 /*
 * log.h
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2016
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,10 +25,7 @@
 #define REPMGR_SYSLOG 1
 #define REPMGR_STDERR 2

-#define OM_COMMAND_LINE 1
-#define OM_DAEMON       2
-
-extern void
+void
 stderr_log_with_level(const char *level_name, int level, const char *fmt,...)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));

@@ -126,17 +123,10 @@ bool		logger_shutdown(void);
 void		logger_set_verbose(void);
 void		logger_set_terse(void);

-void		log_detail(const char *fmt, ...)
-__attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
-void		log_hint(const char *fmt, ...)
-__attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
-void		log_verbose(int level, const char *fmt, ...)
-__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
+void		log_hint(const char *fmt, ...);
+void		log_verbose(int level, const char *fmt, ...);

 extern int	log_type;
 extern int	log_level;
-extern int	verbose_logging;
-extern int	terse_logging;
-extern int	logger_output_mode;

-#endif /* _REPMGR_LOG_H_ */
+#endif
--- a/repmgr.c
+++ b/repmgr.c
--- a/repmgr.conf.sample
+++ b/repmgr.conf.sample
@@ -2,10 +2,6 @@
 # Replication Manager sample configuration file
 ###################################################

-# Some configuration items will be set with a default value; this
-# is noted for each item. Where no default value is shown, the
-# parameter will be treated as empty or false.
-
 # Required configuration items
 # ============================
 #
@@ -15,29 +11,21 @@
 # schema (pattern: "repmgr_{cluster}"); while this name will be quoted
 # to preserve case, we recommend using lower case and avoiding whitespace
 # to facilitate easier querying of the repmgr views and tables.
-#cluster=example_cluster
+cluster=example_cluster

 # Node ID and name
 # (Note: we recommend to avoid naming nodes after their initial
-#  replication function, as this will cause confusion when e.g.
+#  replication funcion, as this will cause confusion when e.g.
 #  "standby2" is promoted to primary)
-#node=2           # a unique integer
-#node_name=node2  # an arbitrary (but unique) string; we recommend using
+node=2           # a unique integer
+node_name=node2  # an arbitrary (but unique) string; we recommend using
                 # the server's hostname or another identifier unambiguously
                 # associated with the server to avoid confusion

 # Database connection information as a conninfo string
 # This must be accessible to all servers in the cluster; for details see:
-#
-#   https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
-#
-#conninfo='host=192.168.204.104 dbname=repmgr user=repmgr'
-#
-# If repmgrd is in use, consider explicitly setting `connect_timeout` in the
-# conninfo string to determine the length of time which elapses before
-# a network connection attempt is abandoned; for details see:
-#
-#   https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNECT-CONNECT-TIMEOUT
+#   http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
+conninfo='host=192.168.204.104 dbname=repmgr_db user=repmgr_usr'

 # Optional configuration items
 # ============================
@@ -45,17 +33,18 @@
 # Replication settings
 # ---------------------

-# When using cascading replication, a standby can connect to another
-# upstream standby node which is specified by setting 'upstream_node'.
-# In that case, the upstream node must exist before the new standby
-# can be registered. If 'upstream_node' is not set, then the standby
-# will connect directly to the primary node.
-#upstream_node=1
+# when using cascading replication and a standby is to be connected to an
+# upstream standby, specify that node's ID with 'upstream_node'. The node
+# must exist before the new standby can be registered. If a standby is
+# to connect directly to a primary node, this parameter is not required.
+#
+# upstream_node=1

-# use physical replication slots - PostgreSQL 9.4 and later only
+# physical replication slots - PostgreSQL 9.4 and later only
 # (default: 0)
-#use_replication_slots=0
-
+#
+# use_replication_slots=0
+#
 # NOTE: 'max_replication_slots' should be configured for at least the
 # number of standbys which will connect to the primary.

@@ -64,21 +53,15 @@

 # Log level: possible values are DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG
 # (default: NOTICE)
-#loglevel=NOTICE
-
-# Note that logging facility settings will only apply to `repmgrd` by default;
-# `repmgr` will always write to STDERR unless the switch `--log-to-file` is
-# supplied, in which case it will log to the same destination as `repmgrd`.
-# This is mainly intended for those cases when `repmgr` is executed directly
-# by `repmgrd`.
+loglevel=NOTICE

 # Logging facility: possible values are STDERR or - for Syslog integration - one of LOCAL0, LOCAL1, ..., LOCAL7, USER
 # (default: STDERR)
-#logfacility=STDERR
+logfacility=STDERR

 # stderr can be redirected to an arbitrary file:
 #
-#logfile='/var/log/repmgr/repmgr.log'
+# logfile='/var/log/repmgr.log'

 # event notifications can be passed to an arbitrary external program
 # together with the following parameters:
@@ -92,12 +75,12 @@
 # the values provided for "%t" and "%d" will probably contain spaces,
 # so should be quoted in the provided command configuration, e.g.:
 #
-#event_notification_command='/path/to/some/script %n %e %s "%t" "%d"'
+# event_notification_command='/path/to/some/script %n %e %s "%t" "%d"'

 # By default, all notifications will be passed; the notification types
 # can be filtered to explicitly named ones:
 #
-#event_notifications=master_register,standby_register,witness_create
+# event_notifications=master_register,standby_register,witness_create


 # Environment/command settings
@@ -105,53 +88,18 @@

 # path to PostgreSQL binary directory (location of pg_ctl, pg_basebackup etc.)
 # (if not provided, defaults to system $PATH)
-#pg_bindir=/usr/bin/
-#
-# Debian/Ubuntu users: you will probably need to set this to the directory
-# where `pg_ctl` is located, e.g. /usr/lib/postgresql/9.5/bin/
-
-# service control commands
-#
-# repmgr provides options to override the default pg_ctl commands
-# used to stop, start, restart, reload and promote the PostgreSQL cluster
-#
-# NOTE: These commands must be runnable on remote nodes as well for switchover
-# to function correctly.
-#
-# If you use sudo, the user repmgr runs as (usually 'postgres')  must have
-# passwordless sudo access to execute the command
-#
-# For example, to use systemd, you may use the following configuration:
-#
-#    # this is required when running sudo over ssh without -t:
-#    Defaults:postgres !requiretty
-#    postgres ALL = NOPASSWD: /usr/bin/systemctl stop postgresql-9.5, \
-#       /usr/bin/systemctl start postgresql-9.5, \
-#       /usr/bin/systemctl restart postgresql-9.5
-#
-# service_start_command = systemctl start postgresql-9.5
-# service_stop_command = systemctl stop postgresql-9.5
-# service_restart_command = systemctl restart postgresql-9.5
-# service_reload_command = pg_ctlcluster 9.5 main reload
-# service_promote_command = pg_ctlcluster 9.5 main promote
+# pg_bindir=/usr/bin/

 # external command options

-#rsync_options=--archive --checksum --compress --progress --rsh="ssh -o \"StrictHostKeyChecking no\""
-#ssh_options=-o "StrictHostKeyChecking no"
+# rsync_options=--archive --checksum --compress --progress --rsh="ssh -o \"StrictHostKeyChecking no\""
+# ssh_options=-o "StrictHostKeyChecking no"

-# external command arguments. Values shown are examples.
+# external command arguments

-#pg_ctl_options='-s'
-#pg_basebackup_options='--label=repmgr_backup'
+# pg_ctl_options='-s'
+# pg_basebackup_options='--xlog-method=s'

-# This is the host name of the barman server, which is used for connecting over
-# to the barman server (passwordless ssh keys should be in place)
-#barman_server='backup_server'
-# If you are placing the barman.conf file in a non-standard path, or using
-# a name other than barman.conf, use this parameter to specify the path and
-# name of the barman configuration file.
-#barman_config='/path/to/barman.conf'

 # Standby clone settings
 # ----------------------
@@ -162,51 +110,35 @@
 #
 # tablespace_mapping=/path/to/original/tablespace=/path/to/new/tablespace

-# You can specify a restore_command to be used in the recovery.conf that
-# will be placed in the cloned standby
-#
-# restore_command = cp /path/to/archived/wals/%f %p

 # Failover settings (repmgrd)
 # ---------------------------
 #
-# These settings are only applied when repmgrd is running. Values shown
-# are defaults.
+# These settings are only applied when repmgrd is running.

-# monitoring interval in seconds; default is 2
-#monitor_interval_secs=2
+# Number of seconds to wait for a response from the primary server before
+# deciding it has failed

-# Maximum number of seconds to wait for a response from the primary server
-# before deciding it has failed.
-#master_response_timeout=60
+master_response_timeout=60

-# Number of attempts at what interval (in seconds) to try and
-# connect to  a server to establish its status (e.g. master
-# during failover)
-#reconnect_attempts=6
-#reconnect_interval=10
+# Number of times to try and reconnect to the primary before starting
+# the failover procedure
+reconnect_attempts=6
+reconnect_interval=10

 # Autofailover options
-#failover=manual    # one of 'automatic', 'manual' (default: manual)
-                    # defines the action to take in the event of upstream failure
-                    #
-                    # 'automatic': repmgrd will automatically attempt to promote the
-                    #    node or follow the new upstream node
-                    # 'manual': repmgrd will take no action and the mode will require
-                    #    manual attention to reattach it to replication
+failover=automatic  # one of 'automatic', 'manual'
+priority=100        # a value of zero or less prevents the node being promoted to primary
+promote_command='repmgr standby promote -f /path/to/repmgr.conf'
+follow_command='repmgr standby follow -f /path/to/repmgr.conf -W'

-#priority=100       # indicate a preferred priorty for promoting nodes
-                    # a value of zero or less prevents the node being promoted to primary
-                    # (default: 100)
-
-#promote_command='repmgr standby promote -f /path/to/repmgr.conf'
-#follow_command='repmgr standby follow -f /path/to/repmgr.conf -W'
+# monitoring interval in seconds; default is 2
+#
+# monitor_interval_secs=2

 # change wait time for primary; before we bail out and exit when the primary
 # disappears, we wait 'reconnect_attempts' * 'retry_promote_interval_secs'
 # seconds; by default this would be half an hour, as 'retry_promote_interval_secs'
 # default value is 300)
-#retry_promote_interval_secs=300
-
-# Number of seconds after which the witness server resyncs the repl_nodes table
-#witness_repl_nodes_sync_interval_secs=15
+#
+# retry_promote_interval_secs=300
--- a/repmgr.h
+++ b/repmgr.h
@@ -1,6 +1,6 @@
 /*
 * repmgr.h
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2016
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -23,21 +23,23 @@
 #include <libpq-fe.h>
 #include <postgres_fe.h>
 #include <getopt_long.h>
-#include "pqexpbuffer.h"

 #include "strutil.h"
 #include "dbutils.h"
 #include "errcode.h"
 #include "config.h"
-#include "dirmod.h"

 #define MIN_SUPPORTED_VERSION		"9.3"
 #define MIN_SUPPORTED_VERSION_NUM	90300

+#include "config.h"
+#define MAXFILENAME		1024
 #define ERRBUFF_SIZE	512

-#define DEFAULT_WAL_KEEP_SEGMENTS	"0"
+#define DEFAULT_WAL_KEEP_SEGMENTS	"5000"
 #define DEFAULT_DEST_DIR		"."
+#define DEFAULT_MASTER_PORT		"5432"
+#define DEFAULT_DBNAME			"postgres"
 #define DEFAULT_REPMGR_SCHEMA_PREFIX	"repmgr_"
 #define DEFAULT_PRIORITY		100
 #define FAILOVER_NODES_MAX_CHECK 50
@@ -48,200 +50,44 @@
 #define NO_UPSTREAM_NODE	-1
 #define UNKNOWN_NODE_ID     -1

-/* command line options without short versions */
-#define OPT_HELP                         1
-#define OPT_CHECK_UPSTREAM_CONFIG        2
-#define OPT_RECOVERY_MIN_APPLY_DELAY     3
-#define OPT_COPY_EXTERNAL_CONFIG_FILES   4
-#define OPT_CONFIG_ARCHIVE_DIR           5
-#define OPT_PG_REWIND                    6
-#define OPT_CSV                          8
-#define OPT_NODE                         9
-#define OPT_WITHOUT_BARMAN               10
-#define OPT_NO_UPSTREAM_CONNECTION       11
-#define OPT_REGISTER_WAIT                12
-#define OPT_CLUSTER                      13
-#define OPT_LOG_TO_FILE                  14
-#define OPT_UPSTREAM_CONNINFO            15
-#define OPT_NO_CONNINFO_PASSWORD         16
-#define OPT_REPLICATION_USER             17
-
-/* deprecated command line options */
-#define OPT_INITDB_NO_PWPROMPT           998
-#define OPT_IGNORE_EXTERNAL_CONFIG_FILES 999
-
-/* values for --copy-external-config-files */
-#define CONFIG_FILE_SAMEPATH 1
-#define CONFIG_FILE_PGDATA 2


 /* Run time options type */
 typedef struct
 {
-	/* general repmgr options */
-	char		config_file[MAXPGPATH];
-	bool		verbose;
-	bool		terse;
-	bool		force;
-	char		pg_bindir[MAXLEN]; /* overrides setting in repmgr.conf */

-	/* logging parameters */
-	char		loglevel[MAXLEN];  /* overrides setting in repmgr.conf */
-	bool		log_to_file;
-
-	/* connection parameters */
 	char		dbname[MAXLEN];
 	char		host[MAXLEN];
 	char		username[MAXLEN];
-	char		dest_dir[MAXPGPATH];
+	char		dest_dir[MAXFILENAME];
+	char		config_file[MAXFILENAME];
 	char		remote_user[MAXLEN];
 	char		superuser[MAXLEN];
-	char		masterport[MAXLEN];
-	bool		conninfo_provided;
-	bool		connection_param_provided;
-	bool		host_param_provided;
-
-	/* standby clone parameters */
-	bool		wal_keep_segments_used;
 	char		wal_keep_segments[MAXLEN];
+	bool		verbose;
+	bool		terse;
+	bool		force;
+	bool		wait_for_master;
 	bool		ignore_rsync_warn;
+	bool		initdb_no_pwprompt;
 	bool		rsync_only;
 	bool		fast_checkpoint;
-	bool		without_barman;
-	bool		no_upstream_connection;
-	bool		no_conninfo_password;
-	bool		copy_external_config_files;
-	int			copy_external_config_files_destination;
-	char		upstream_conninfo[MAXLEN];
-	char		replication_user[MAXLEN];
+	bool		ignore_external_config_files;
+	char		masterport[MAXLEN];
+	char		localport[MAXLEN];
+	char		loglevel[MAXLEN];

-	char		recovery_min_apply_delay[MAXLEN];
-
-	/* standby register parameters */
-	bool		wait_register_sync;
-	int			wait_register_sync_seconds;
-
-	/* witness create parameters */
-	bool		witness_pwprompt;
-
-	/* standby follow parameters */
-	bool		wait_for_master;
-
-	/* cluster {show|matrix|crosscheck} parameters */
-	bool		csv_mode;
-
-	/* cluster cleanup parameters */
+	/* parameter used by CLUSTER CLEANUP */
 	int			keep_history;

-	/* standby switchover parameters */
-	char		remote_config_file[MAXLEN];
-	bool		pg_rewind_supplied;
-	char		pg_rewind[MAXPGPATH];
-	char		pg_ctl_mode[MAXLEN];
-
-	/* standby {archive_config | restore_config} parameters  */
-	char		config_archive_dir[MAXLEN];
-
-	/* {standby|witness} unregister parameters */
-	int			node;
+	char		pg_bindir[MAXLEN];

+	char		recovery_min_apply_delay[MAXLEN];
 }	t_runtime_options;

-#define T_RUNTIME_OPTIONS_INITIALIZER { \
-		/* general repmgr options */	\
-		"", false, false, false, "",	\
-		/* logging parameters */ \
-		"", false,                      \
-		/* connection parameters */		\
-		"", "", "", "", "", "", "", 	\
-		false, false, false,		    \
-		/* standby clone parameters */  \
-		false, DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, \
-		false, CONFIG_FILE_SAMEPATH, "", "", "", \
-		/* standby register paarameters */ \
-	    false, 0,							 \
-		/* witness create parameters */ \
-		false,                          \
-		/* standby follow parameters */ \
-		false,                          \
-		/* cluster {show|matrix|crosscheck} parameters */ \
-		false,                          \
-		/* cluster cleanup parameters */ \
-		0,                              \
-		/* standby switchover parameters */ \
-		"", false, "", "fast",          \
-		/* standby {archive_config | restore_config} parameters  */ \
-		"",                             \
-		/* {standby|witness} unregister parameters */ \
-		UNKNOWN_NODE_ID }
-
-struct BackupLabel
-{
-	XLogRecPtr start_wal_location;
-	char start_wal_file[MAXLEN];
-	XLogRecPtr checkpoint_location;
-	char backup_from[MAXLEN];
-	char backup_method[MAXLEN];
-	char start_time[MAXLEN];
-	char label[MAXLEN];
-	XLogRecPtr min_failover_slot_lsn;
-};
-
-
-typedef struct
-{
-	char		slot[MAXLEN];
-	char		xlog_method[MAXLEN];
-	bool		no_slot; /* from PostgreSQL 10 */
-} t_basebackup_options;
-
-#define T_BASEBACKUP_OPTIONS_INITIALIZER { "", "", false }
-
-typedef struct
-{
-	int    size;
-	char **keywords;
-	char **values;
-} t_conninfo_param_list;
-
-typedef struct
-{
-	char filepath[MAXPGPATH];
-	char filename[MAXPGPATH];
-	bool in_data_directory;
-} t_configfile_info;
-
-
-typedef struct
-{
-	int    size;
-	int    entries;
-	t_configfile_info **files;
-} t_configfile_list;
-
-#define T_CONFIGFILE_LIST_INITIALIZER { 0, 0, NULL }
-
-
-typedef struct
-{
-	int node_id;
-	int node_status;
-} t_node_status_rec;
-
-typedef struct
-{
-	int node_id;
-	char node_name[MAXLEN];
-	t_node_status_rec **node_status_list;
-} t_node_matrix_rec;
-
-typedef struct
-{
-	int node_id;
-	char node_name[MAXLEN];
-	t_node_matrix_rec **matrix_list_rec;
-} t_node_status_cube;
+#define T_RUNTIME_OPTIONS_INITIALIZER { "", "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, false, false, false, "", "", "", 0, "", "" }

+extern char		repmgr_schema[MAXLEN];


 #endif
--- a/repmgr.sql
+++ b/repmgr.sql
@@ -1,7 +1,7 @@
 /*
 * repmgr.sql
 *
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2016
 *
 */

@@ -59,12 +59,3 @@ WHERE (standby_node, last_monitor_time) IN (SELECT standby_node, MAX(last_monito
 ALTER VIEW repl_status OWNER TO repmgr;

 CREATE INDEX idx_repl_status_sort ON repl_monitor(last_monitor_time, standby_node);
-
-/*
- * This view shows the list of nodes with the information of which one is the upstream
- * in each case (when appliable)
- */
-CREATE VIEW repl_show_nodes AS
-SELECT rn.id, rn.conninfo, rn.type, rn.name, rn.cluster,
-	rn.priority, rn.active, sq.name AS upstream_node_name
-FROM repl_nodes as rn LEFT JOIN repl_nodes AS sq ON sq.id=rn.upstream_node_id;
--- a/repmgrd.c
+++ b/repmgrd.c
--- a/sql/Makefile
+++ b/sql/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# Copyright (c) 2ndQuadrant, 2010-2017
+# Copyright (c) 2ndQuadrant, 2010-2016
 #

 MODULE_big = repmgr_funcs
--- a/sql/repmgr2_repmgr3.sql
+++ b/sql/repmgr2_repmgr3.sql
@@ -63,15 +63,6 @@ UPDATE repl_nodes SET type = 'master' WHERE id = $master_id;

 -- UPDATE repl_nodes SET active = FALSE WHERE id IN (...);

-/* There's also an event table which we need to create */
-CREATE TABLE repl_events (
-  node_id          INTEGER NOT NULL,
-  event            TEXT NOT NULL,
-  successful       BOOLEAN NOT NULL DEFAULT TRUE,
-  event_timestamp  TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  details          TEXT NULL
-);
-
 /* When you're sure of your changes, commit them */

 -- COMMIT;
--- a/sql/repmgr3.0_repmgr3.1.sql
+++ b/sql/repmgr3.0_repmgr3.1.sql
@@ -1,35 +0,0 @@
-/*
- * Update a repmgr 3.0 installation to repmgr 3.1
- * ----------------------------------------------
- *
- * The new repmgr package should be installed first. Then
- * carry out these steps:
- *
- *   1. (If repmgrd is used) stop any running repmgrd instances
- *   2. On the master node, execute the SQL statements listed below
- *   3. (If repmgrd is used) restart repmgrd
- */
-
-/*
- * If your repmgr installation is not included in your repmgr
- * user's search path, please set the search path to the name
- * of the repmgr schema to ensure objects are installed in
- * the correct location.
- *
- * The repmgr schema is  "repmgr_" + the cluster name defined in
- * 'repmgr.conf'.
- */
-
-- SET search_path TO 'name_of_repmgr_schema';
-
-BEGIN;
-
-- New view "repl_show_nodes" which also displays the server's
-- upstream node
-
-CREATE VIEW repl_show_nodes AS
-SELECT rn.id, rn.conninfo, rn.type, rn.name, rn.cluster,
-	rn.priority, rn.active, sq.name AS upstream_node_name
-FROM repl_nodes as rn LEFT JOIN repl_nodes AS sq ON sq.id=rn.upstream_node_id;
-
-COMMIT;
--- a/sql/repmgr3.1.1_repmgr3.1.2.sql
+++ b/sql/repmgr3.1.1_repmgr3.1.2.sql
@@ -1,32 +0,0 @@
-/*
- * Update a repmgr 3.1.1 installation to repmgr 3.1.2
- * --------------------------------------------------
- *
- * This update is only required if repmgrd is being used in conjunction
- * with a witness server.
- *
- * The new repmgr package should be installed first. Then
- * carry out these steps:
- *
- *   1. (If repmgrd is used) stop any running repmgrd instances
- *   2. On the master node, execute the SQL statement listed below
- *   3. (If repmgrd is used) restart repmgrd
- */
-
-/*
- * If your repmgr installation is not included in your repmgr
- * user's search path, please set the search path to the name
- * of the repmgr schema to ensure objects are installed in
- * the correct location.
- *
- * The repmgr schema is  "repmgr_" + the cluster name defined in
- * 'repmgr.conf'.
- */
-
-- SET search_path TO 'name_of_repmgr_schema';
-
-BEGIN;
-
-ALTER TABLE repl_nodes DROP CONSTRAINT repl_nodes_upstream_node_id_fkey,
-      ADD CONSTRAINT repl_nodes_upstream_node_id_fkey FOREIGN KEY (upstream_node_id) REFERENCES repl_nodes(id) DEFERRABLE;
-COMMIT;
--- a/sql/repmgr_funcs.c
+++ b/sql/repmgr_funcs.c
@@ -83,12 +83,7 @@ _PG_init(void)
 	 * resources in repmgr_shmem_startup().
 	 */
 	RequestAddinShmemSpace(repmgr_memsize());
-
-#if (PG_VERSION_NUM >= 90600)
-	RequestNamedLWLockTranche("repmgr", 1);
-#else
 	RequestAddinLWLocks(1);
-#endif

 	/*
 	 * Install hooks.
@@ -133,11 +128,7 @@ repmgr_shmem_startup(void)
 	if (!found)
 	{
 		/* First time through ... */
-#if (PG_VERSION_NUM >= 90600)
-		shared_state->lock = &(GetNamedLWLockTranche("repmgr"))->lock;
-#else
 		shared_state->lock = LWLockAssign();
-#endif
 		snprintf(shared_state->location,
 				 sizeof(shared_state->location), "%X/%X", 0, 0);
 	}
--- a/sql/repmgr_funcs.sql.in
+++ b/sql/repmgr_funcs.sql.in
@@ -1,6 +1,6 @@
 /*
 * repmgr_function.sql
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2016
 *
 */

--- a/sql/repmgr_test.sql
+++ b/sql/repmgr_test.sql
@@ -1,4 +0,0 @@
-select * from repmgr_update_standby_location('');
-select * from repmgr_get_last_standby_location();
-select * from repmgr_update_last_updated();
-select * from repmgr_get_last_updated();
--- a/sql/uninstall_repmgr_funcs.sql
+++ b/sql/uninstall_repmgr_funcs.sql
@@ -1,6 +1,6 @@
 /*
 * uninstall_repmgr_funcs.sql
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2016
 *
 */

--- a/strutil.c
+++ b/strutil.c
@@ -1,7 +1,7 @@
 /*
 * strutil.c
 *
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2016
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -87,21 +87,3 @@ maxlen_snprintf(char *str, const char *format,...)

 	return retval;
 }
-
-
-/*
- * Escape a string for use as a parameter in recovery.conf
- * Caller must free returned value
- */
-char *
-escape_recovery_conf_value(const char *src)
-{
-	char	   *result = escape_single_quotes_ascii(src);
-
-	if (!result)
-	{
-		fprintf(stderr, _("%s: out of memory\n"), progname());
-		exit(ERR_INTERNAL);
-	}
-	return result;
-}
--- a/strutil.h
+++ b/strutil.h
@@ -1,6 +1,6 @@
 /*
 * strutil.h
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2016
 *
 *
 * This program is free software: you can redistribute it and/or modify
@@ -22,20 +22,14 @@
 #define _STRUTIL_H_

 #include <stdlib.h>
-#include "pqexpbuffer.h"
 #include "errcode.h"

-
 #define QUERY_STR_LEN	8192
 #define MAXLEN			1024
 #define MAXLINELENGTH	4096
 #define MAXVERSIONSTR	16
 #define MAXCONNINFO		1024

-/* Why? http://stackoverflow.com/a/5459929/398670 */
-#define STR(x) CppAsString(x)
-
-#define MAXLEN_STR STR(MAXLEN)

 extern int
 xsnprintf(char *str, size_t size, const char *format,...)
@@ -49,6 +43,4 @@ extern int
 maxlen_snprintf(char *str, const char *format,...)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));

-extern char *
-escape_recovery_conf_value(const char *src);
 #endif   /* _STRUTIL_H_ */
--- a/uninstall_repmgr.sql
+++ b/uninstall_repmgr.sql
@@ -1,7 +1,7 @@
 /*
 * uninstall_repmgr.sql
 *
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2016
 *
 */

--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_

-#define REPMGR_VERSION "3.3.2"
+#define REPMGR_VERSION "3.0.3"

 #endif
Author	SHA1	Message	Date
Ian Barwick	7cc7a278c2	Fix comment typo	2016-01-19 11:40:03 +09:00
Ian Barwick	20d9f978ab	Update HISTORY	2016-01-14 11:51:51 +09:00
Ian Barwick	70a2797b9a	Improve "archive_mode" configuration check There's no compelling reason to require "archive_mode" to be enabled for streaming replication. It is of course a good idea to archive WAL using e.g. barman ( http://www.pgbarman.org/ ) as part of a comprehensive backup strategy, but repmgr and streaming replication work fine without it. Per GitHub #141. Also revise the configuration check for "archive_command" to be triggered only when "archive_mode" is not "off", as from PostgreSQL 9.5 onwards "archive_mode" can also be "on" or "always".	2016-01-14 11:51:30 +09:00
Ian Barwick	8f62b4c9e6	Update copyright notice to 2016	2016-01-05 15:57:25 +09:00
Ian Barwick	310f3f31f9	Update HISTORY	2016-01-05 13:36:34 +09:00
Ian Barwick	4f849de95e	Suppress warning about -w/--wal-keep-segments unless actually specified Already implemented in HEAD.	2016-01-05 13:16:38 +09:00
Ian Barwick	0de4260664	repmgr: -r/--rsync-only does not require a parameter	2016-01-05 11:05:54 +09:00
Ian Barwick	fc75084e42	repmgrd: -v/--verbose option does not require a parameter	2016-01-05 10:50:04 +09:00
Ian Barwick	cfbc9dd3c6	Backport update_node_record_status()	2016-01-04 15:27:47 +09:00
Ian Barwick	94579b5f2e	Clean up whitespace and comments	2016-01-04 14:41:15 +09:00
Ian Barwick	e9a25c367a	Prevent invalid replication_lag values being written to the monitoring table A fix for this was introduced with commit `ee9270fe8d` and removed in `4f1c67a1bf`. Refactor the original fix to simply omit attempting to write an invalid entry to the monitoring table.	2016-01-04 14:37:22 +09:00
Ian Barwick	3088096318	No need to manually create repmgr schema.	2016-01-04 14:33:41 +09:00
Ian Barwick	3bbd32c73c	Add note about why 'hot_standby=on' is currently required	2016-01-04 14:30:15 +09:00
Martin	ac17033d61	This doesn't really mean the standby s following a new master, so we are removing it. Basically, on startup the standby will start receiving again from the begining of the WAL and so received will be lower then applied. A proper code is needed to make sure the standby is still following the correct master (as per node information)	2016-01-04 14:29:56 +09:00
Martín Marqués	711ad0a76c	Change where we activate back the standby node that was failed. We will do it where we are sending the message that says that the standby has recovered, eliminating some complexity	2016-01-04 14:28:39 +09:00
Martín Marqués	ad988dccce	Fix bug discovered last week which prevents recovered standby from being used in the cluster. Main issue was that if the local repmgrd was not able to connect locally, it would set the local node as failed (active = false). This is fine, because we actually don't know if the node is active (actually, it's not active ATM) so it's best to keep it out of the cluster. The problem is that if the postgres service comes back up, and is able to recover by it self, then we should ack that fact and set it as active. There was another issue related with repmgrd being terminated if the postgres service was downs. This is not the correct thing to do: we should keep trying to connect to the local standby.	2016-01-04 14:28:33 +09:00
Martín Marqués	53fe3c7e5a	Fix bug discovered last week which prevents recovered standby from being used in the cluster. Main issue was that if the local repmgrd was not able to connect locally, it would set the local node as failed (active = false). This is fine, because we actually don't know if the node is active (actually, it's not active ATM) so it's best to keep it out of the cluster. The problem is that if the postgres service comes back up, and is able to recover by it self, then we should ack that fact and set it as active. There was another issue related with repmgrd being terminated if the postgres service was downs. This is not the correct thing to do: we should keep trying to connect to the local standby.	2016-01-04 14:28:26 +09:00
József Kószó	7a439c90d0	Debian init script repmgrd process stop fix	2016-01-04 14:28:20 +09:00
Ian Barwick	87e5257cb8	Short option -c does not take a value	2015-12-22 12:37:38 +09:00
Ian Barwick	1f240ff9b3	Update HISTORY	2015-11-30 16:58:13 +09:00
Ian Barwick	9d6cff0d40	Bump version to 3.0.3	2015-11-30 16:30:50 +09:00
Ian Barwick	f86e251430	Backport drop_replication_slot() from HEAD	2015-11-30 16:30:29 +09:00
Ian Barwick	085b7cb8b4	pg_replslot will only exist in 9.4 and later We need to clean this up regardless of whether "use_replication_slots" is set.	2015-11-30 16:19:37 +09:00
Ian Barwick	5ccf89ad9b	Ensure pg_replslot directory is cleaned up after "standby clone" with rsync This ensures the directory is in the same state as it would be after cloning the standby with pg_basebackup, i.e. empty.	2015-11-30 16:19:31 +09:00
Ian Barwick	6ae5401df0	Update TODO	2015-11-30 16:19:25 +09:00
Ian Barwick	4bd8190d02	Drop a previously created replication slot if base backup fails for any reason Per Github #129	2015-11-30 16:19:19 +09:00
Ian Barwick	efdc2355a7	Ensure all failures encountered during a base backup jump to the stop_backup label	2015-11-30 16:19:05 +09:00
Ian Barwick	61b1f72a0e	Put "starting backup" notice after any slot creation	2015-11-30 16:19:00 +09:00
Abhijit Menon-Sen	882bfd9d8e	If we're using replication slots, we need to create them earlier Otherwise, if the backup takes a long time, we might lose WAL we need long before we create the slot.	2015-11-30 16:18:52 +09:00
Ian Barwick	c93f717305	Ensure 'master register --force' can't create more than one active primary node record	2015-11-30 16:18:46 +09:00
Ian Barwick	85be96a0be	Remove unusable setting Not a configuration item or command line option; variable is always false.	2015-11-30 16:18:41 +09:00
Ian Barwick	ce2d4fb86f	Make t_node_info generally available And have it include all the fields from the repl_nodes table.	2015-11-30 16:18:35 +09:00
Ian Barwick	40354e1d62	Add item about hash indexes.	2015-11-30 16:18:29 +09:00
Ian Barwick	3e1655f241	Remove hint about hash indexes entirely. Anyone needing them, particularly in a replication context, should know what they're doing anyway. See also: http://www.postgresql.org/docs/current/interactive/sql-createindex.html#AEN74175 "Also, changes to hash indexes are not replicated over streaming or file-based replication after the initial base backup, so they give wrong answers to queries that subsequently use them. For these reasons, hash index use is presently discouraged."	2015-11-30 16:18:24 +09:00
Ian Barwick	8387e7f65e	Add missing 'break'	2015-11-30 16:18:17 +09:00
Ian Barwick	aa4dd155b2	Remove unused variable	2015-11-30 16:17:59 +09:00
Ian Barwick	a171a501ab	Shift some common but not terribly informative log messages to verbose mode only	2015-11-30 16:17:52 +09:00
Ian Barwick	f42f771ff4	Logging fixes	2015-11-30 16:17:46 +09:00
Ian Barwick	88cfcf358e	Update TODO	2015-11-30 16:17:41 +09:00
Ian Barwick	ce3594d52d	Add /etc/repmgr.conf as a default configuration file location Also refactor configuration file handling while we're at it. Previously a configuration file would be ignored if it couldn't be opened, however that is now treated as an error.	2015-11-30 16:17:23 +09:00
Ian Barwick	f64c42a514	Simplify logger_init() parameters We're passing the t_configuration_options structure anyway, no need to pass items it contains as separate parameters.	2015-11-30 16:17:17 +09:00
Ian Barwick	3072139d06	Update code comments	2015-11-30 16:17:10 +09:00
Ian Barwick	3b7185fd39	Update TODO	2015-11-30 16:17:06 +09:00
Ian Barwick	819f980e76	Don't display warnings about unused command line parameters in --terse mode	2015-11-30 16:16:58 +09:00
Ian Barwick	49316fb8fb	repmgr: don't error out on superfluous command line options When parsing command line arguments in check_parameters_for_action(), create warnings for paramters supplied but not required (e.g. -D/--data-dir for MASTER REGISTER), rather than fail with error(s), as the presence of the parameters won't cause any problems. Errors will still be raised for required-but-missing parameters, of course.	2015-11-30 16:16:53 +09:00
Ian Barwick	fa4ff73b87	Remove implemented TODO item	2015-11-30 16:16:46 +09:00
Ian Barwick	29842f0e0d	Metadata update also handled by repmgr	2015-11-30 16:16:37 +09:00
Ian Barwick	25db1ba737	When following a new primary, have repmgr (not repmgrd) create the new slot	2015-11-30 16:16:26 +09:00
Ian Barwick	7b9f6f5352	Minor log message fixes	2015-11-30 16:16:03 +09:00
Ian Barwick	53b8f99217	Add a TODO item	2015-11-30 16:15:57 +09:00
Ian Barwick	95cdaac91d	Update TODO	2015-11-30 16:15:52 +09:00
Ian Barwick	e7dd0f690c	Remove implemented items from TODO list * repmgr: add explicit --log-level flag, repurpose --verbose flag to show extra detailed/repetitive output only (see item below too) -> `e0cbdd5b31` * debug output: show some repetitive output only if --verbose flag set to prevent excessive log growth -> `8ab1901a93`	2015-11-30 16:15:46 +09:00
Ian Barwick	e0c5bb8d31	Refactor get_master_connection() and update description Use 'remote_conn' instead of 'master_conn', as the connection handle can potentially be used for any node.	2015-11-30 16:15:36 +09:00
Ian Barwick	df3e55fa35	get_master_connection(): order node list by node type and priority This should make it more likely that the actual primary is first in the retrieved list, reducing the number of connections to other nodes in the cluster which need to be made.	2015-11-30 16:15:30 +09:00
Ian Barwick	0ee2a1e6ba	Code formatting	2015-11-30 16:15:25 +09:00
Ian Barwick	df05214970	Fix variable argument handling with log_hint()/log_verbose()	2015-11-30 16:15:19 +09:00
Ian Barwick	bd1314d232	get_master_connection(): possible to use is_standby() now	2015-11-30 16:15:14 +09:00
Ian Barwick	745566605d	Tidy up logging output in dbutils.c Log all executed SQL if verbose mode is enabled.	2015-11-30 16:15:09 +09:00
Ian Barwick	807dcc1038	Repurpose -v/--verbose; add -t/--terse option (repmgr only) repmgr and particularly repmgrd currently produce substantial amounts of log output. Much of this is only useful when troubleshooting or debugging. Previously the -v/--verbose option just forced the log level to INFO. With repmgrd this is pretty pointless - just set the log level in the configuration file. With repmgr the configuration file can be overriden by the new -L/--log-level option. -v/--verbose now provides an additional, chattier/pedantic level of logging ("Opening this logfile", "Executing this query", "running in this loop") which is helpful for understanding repmgr/repmgrd's behaviour, particularly for troubleshooting. What additional verbose logging is generated will of course a also depends on the log level set, so e.g. someone trying to work out which configuration file is actually being opened can use '--log-level=INFO --verbose' without being bothered by an avalanche of extra verbose debugging output. -t/--terse option will silence certain non-essential output, at the moment any HINTs. Note that -v/--verbose and -t/--terse are not mutually exclusive (suggestions for better names welcome).	2015-11-30 16:15:03 +09:00
Ian Barwick	acc0ffa81f	Add -L/--log-level command line option to repmgr Overrides any setting in the config file. This will replace the -v/--verbose option.	2015-11-30 16:14:54 +09:00
Ian Barwick	1725e90308	Change directory warning to a hint	2015-11-30 16:14:44 +09:00
Ian Barwick	2a3fb89603	Explicitly mark static functions as static	2015-11-30 16:14:39 +09:00
Ian Barwick	8f24167f68	detect_log_level(): return -1 to indicate invalid log level 0 is EMERG, which is not actually used but is valid. Prior to this change, repmgr would complain about an invalid log level if set to this.	2015-11-30 16:14:31 +09:00
Ian Barwick	6ce94778d7	README.md: add note about setting repmgr user search path	2015-11-30 16:14:25 +09:00
Ian Barwick	3a3c6d5143	Add TODO items	2015-11-30 16:14:18 +09:00
Ian Barwick	73661637e9	Add hint about -c/--fast-checkpoint When cloning a server without this option, and pg_start_backup() takes time to complete, repmgr appears to hang and give no indication of what may or may not be happening. The hint provides an explanation for any delay and possible action which could be taken to mitigate it.	2015-11-30 16:14:13 +09:00
Ian Barwick	ae84041a4e	Add log_hint() function for logging hints There are a few places where additional hints are written as log output, usually LOG_NOTICE. Create an explicit function to provide hints in a standardized manner; by storing the log level of the previous logger call, we can ensure the hint is only displayed when the log message itself would be. Part of an ongoing effort to better control repmgr's logging output.	2015-11-30 16:14:08 +09:00
Ian Barwick	ea01d1d30b	Always use catalog path when calling system functions Removes any risk of issues due to search path mangling etc.	2015-11-30 16:13:31 +09:00
Ian Barwick	53ed8e948c	Clean up help output master/primary register only has one option	2015-11-30 16:13:22 +09:00
Ian Barwick	43626892d0	Improve configuration file parsing Related to Github #127. - use the previously introduced repmgr_atoi() function to parse integers better - collate all detected errors and output as a list, rather than failing on the first error.	2015-11-30 16:13:16 +09:00
Ian Barwick	8870b7d7f1	Rename variable 'reconnect_intvl' to 'reconnect_interval' For consistency with the configuration file parameter name	2015-11-30 16:13:08 +09:00
Ian Barwick	72b1e57251	Use strtol() to parse config file arguments too	2015-11-30 16:13:01 +09:00
Ian Barwick	6054da2c25	Use strtol() in place of atoi() to better verify integer parameters Per GitHub #127	2015-11-30 16:12:30 +09:00
Ian Barwick	049ea4e24f	cluster cleanup: standardize error message and return code	2015-11-30 16:12:19 +09:00
Ian Barwick	5f8185ef3a	Fix log wording	2015-11-30 16:12:13 +09:00
Ian Barwick	66a6c15773	Add informtative logging output for 'repmgr cluster cleanup' Per Github issue #126.	2015-11-30 16:12:06 +09:00
Ian Barwick	919fc0fbef	"How many" -> "Number of"	2015-11-30 16:11:57 +09:00
Ian Barwick	c7c117130b	"in 9.4" -> "from 9.4"	2015-11-30 16:11:52 +09:00
Ian Barwick	df6517f167	Add note about logfile rotation and repmgrd	2015-11-30 16:11:47 +09:00
Ian Barwick	0bf3fb0605	Point out existence of the FAQ	2015-11-30 16:11:41 +09:00
Ian Barwick	c2172d79a5	Wording tweak to prevent ambiguity.	2015-11-30 16:11:35 +09:00
Ian Barwick	709276a19c	Add TODO item	2015-11-30 16:11:27 +09:00
Ian Barwick	3f98e1b91b	Replace "slave" with "standby" for consistency "standby" is used everywhere except in these two error messages.	2015-11-30 16:11:21 +09:00
Ian Barwick	8af08ab3f4	Remove duplicated TODO item Conflicts: TODO	2015-11-30 16:11:01 +09:00
Ian Barwick	ff038a5148	Update HISTORY	2015-11-30 16:10:04 +09:00
Ian Barwick	f56f70c2a6	Specify relevant node in error message	2015-11-30 16:09:59 +09:00
Ian Barwick	d353fe2a9f	Terminate repmgrd if standby is no longer connected to upstream	2015-11-30 16:09:50 +09:00
Ian Barwick	a70a44605f	Update FAQ entry about witness port specification	2015-11-30 16:09:41 +09:00
Ian Barwick	d14dcb3d8b	Add FAQ item about repmgr permissions in pg_hba.conf	2015-11-30 16:09:28 +09:00
Ian Barwick	249ac7c72a	Update TODO	2015-11-30 16:09:19 +09:00
Ian Barwick	9d850fc4bd	Add note about default log level	2015-11-30 16:09:14 +09:00
Ian Barwick	42cb811a07	Put declarations at top of file	2015-11-30 16:09:08 +09:00
Ian Barwick	1e202540e3	Explicitly set default value for 'use_replication_slots'	2015-11-30 16:09:01 +09:00
Ian Barwick	52db03d320	Add 'primary_response_timeout' as synonym for 'master_response_timeout' We'll switch terminology in a future release and maintain 'master_response_timeout' for backwards compatibility	2015-11-30 16:08:56 +09:00
Ian Barwick	60d720f0c7	Clarify items in the sample repmgr.conf file Based on customer feedback.	2015-11-30 16:08:47 +09:00
Ian Barwick	34af7dec2a	Use pg_malloc0() instead of malloc() See also `d08bd352c1`	2015-11-30 16:08:39 +09:00
Ian Barwick	a59ea243c0	Improve logging and event notifications when following new upstream node	2015-11-30 16:08:30 +09:00
Ian Barwick	0c5025b3d6	Add note about checking replication slots when following upstream node	2015-11-30 16:08:07 +09:00
Ian Barwick	42b79b9b54	Improve log messages when following new primary	2015-11-30 16:07:39 +09:00
Ian Barwick	2e47c6b40b	Minor formatting tweak	2015-11-30 16:07:32 +09:00
Ian Barwick	6fbff4747f	Clarify some items in sample config file Also change "master" to "primary" in the comments for consistency with main PostgreSQL terminology. We'll need to add aliases for the configuration parameters at some point...	2015-11-30 16:07:23 +09:00
Ian Barwick	cc567d38c8	Update TODO Conflicts: TODO	2015-11-30 16:04:39 +09:00
Ian Barwick	69c552b8e0	Only log some debug items if verbose flag is set.	2015-11-30 16:03:56 +09:00
Ian Barwick	51967d2bd8	Add missing space	2015-11-30 16:03:50 +09:00
Ian Barwick	97be9c0cda	Reword log level error message to be more like the Postgres one	2015-11-30 16:03:43 +09:00
Ian Barwick	00a28fbb1e	Clarify purpose of get_repmgr_schema()	2015-11-30 16:03:17 +09:00
Ian Barwick	d512bac31d	Clean up --help output There are a confusing number of command line options, some of which are only valid for particular operations, e.g. "standby clone".	2015-11-30 16:02:59 +09:00
Martín Marqués	fb6781775d	Fix bug which prevents repmgrd from starting when the cluster name has upper case letters.	2015-10-08 19:46:34 -03:00
Ian Barwick	04c751a912	Update HISTORY	2015-10-02 14:40:28 +09:00
Ian Barwick	2615cffecc	v3.0.2 Not yet tagged, pending a couple of tests	2015-10-02 11:46:13 +09:00
Ian Barwick	1f838f99c2	Update TODO	2015-10-02 11:46:13 +09:00
Ian Barwick	d3f119005b	Update version string to 3.0.1	2015-10-02 11:45:57 +09:00
Ian Barwick	db6d4d8820	Update version string	2015-10-02 11:45:57 +09:00