Change default of log_directory to 'log'

The previous default 'pg_log' might have indicated by its "pg_" prefix
that it is an internal system directory.  The new default is more in
line with the typical naming of directories with user-facing log files.
Together with the renaming of pg_clog and pg_xlog, this should clear up
that difference.

Author: Andreas Karlsson <andreas@proxel.se>

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 2de3540def75257ca41fcd30edf5a1946decd081..ac339fb56666e7d594f28a9e3c939932ff482f85 100644 (file)
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -4363,8 +4363,8 @@ SELECT * FROM parent WHERE key = 2400;
         find the logs currently in use by the instance. Here is an example of
         this file's content:
 <programlisting>
-stderr pg_log/postgresql.log
-csvlog pg_log/postgresql.csv
+stderr log/postgresql.log
+csvlog log/postgresql.csv
 </programlisting>
 
         <filename>current_logfiles</filename> is recreated when a new log file
@@ -4466,7 +4466,7 @@ local0.*    /var/log/postgresql
         cluster data directory.
         This parameter can only be set in the <filename>postgresql.conf</>
         file or on the server command line.
-        The default is <literal>pg_log</literal>.
+        The default is <literal>log</literal>.
        </para>
       </listitem>
      </varlistentry>

diff --git a/doc/src/sgml/file-fdw.sgml b/doc/src/sgml/file-fdw.sgml
index 309a303e0319238b6d74da0569c7db5d3cfe7ce8..74941a6f1ec66fcde4635dc3ec8359b34575060c 100644 (file)
--- a/doc/src/sgml/file-fdw.sgml
+++ b/doc/src/sgml/file-fdw.sgml
@@ -262,7 +262,7 @@ CREATE FOREIGN TABLE pglog (
   location text,
   application_name text
 ) SERVER pglog
-OPTIONS ( filename '/home/josh/9.1/data/pg_log/pglog.csv', format 'csv' );
+OPTIONS ( filename '/home/josh/data/log/pglog.csv', format 'csv' );
 </programlisting>
   </para>
 

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 291bf7631dba7731f11f424e1e7488017e07c51d..e9d561b185e4e59ab242c8e0f1999eb5fe37983a 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -3320,7 +3320,7 @@ static struct config_string ConfigureNamesString[] =
                        GUC_SUPERUSER_ONLY
                },
                &Log_directory,
-               "pg_log",
+               "log",
                check_canonical_path, NULL, NULL
        },
        {

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index a02b154863d90d79b20f8378488fd01d06f573b9..8a93bdcb3f0ae483cf528ba7e4da57bb3e7d5356 100644 (file)
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -344,7 +344,7 @@
                                        # (change requires restart)
 
 # These are only used if logging_collector is on:
-#log_directory = 'pg_log'              # directory where log files are written,
+#log_directory = 'log'                 # directory where log files are written,
                                        # can be absolute or relative to PGDATA
 #log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log'       # log file name pattern,
                                        # can include strftime() escapes

diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index 1ad8f7fc1cd419ee0ab852bcaabd003eb332dfe0..cb84f1f2c6dea4b52be669d66b813967b675ed64 100644 (file)
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -551,7 +551,7 @@ sub _backup_fs
                $backup_path,
                filterfn => sub {
                        my $src = shift;
-                       return ($src ne 'pg_log' and $src ne 'postmaster.pid');
+                       return ($src ne 'log' and $src ne 'postmaster.pid');
                });
 
        if ($hot)

diff --git a/src/test/perl/RecursiveCopy.pm b/src/test/perl/RecursiveCopy.pm
index 3e9881328680fa2b08240e6325e5b7a826a7ecf8..28ecaf6db238848bcc4845e0903b184302f791c6 100644 (file)
--- a/src/test/perl/RecursiveCopy.pm
+++ b/src/test/perl/RecursiveCopy.pm
@@ -48,9 +48,9 @@ attempted.
 
  RecursiveCopy::copypath('/some/path', '/empty/dir',
     filterfn => sub {
-               # omit pg_log and contents
+               # omit log/ and contents
                my $src = shift;
-               return $src ne 'pg_log';
+               return $src ne 'log';
        }
  );