summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2017-03-27 14:34:33 +0000
committerPeter Eisentraut2017-03-27 14:34:33 +0000
commit3371e4d9b12455fe1f8d1516d0bd915aab86be17 (patch)
tree278f4fc47055897597c922eb0b796ca302ceb71a
parenta171f01501e11a2ef65d437ac2397a0050892d88 (diff)
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 <[email protected]>
-rw-r--r--doc/src/sgml/config.sgml6
-rw-r--r--doc/src/sgml/file-fdw.sgml2
-rw-r--r--src/backend/utils/misc/guc.c2
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample2
-rw-r--r--src/test/perl/PostgresNode.pm2
-rw-r--r--src/test/perl/RecursiveCopy.pm4
6 files changed, 9 insertions, 9 deletions
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 2de3540def..ac339fb566 100644
--- 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 309a303e03..74941a6f1e 100644
--- 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 291bf7631d..e9d561b185 100644
--- 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 a02b154863..8a93bdcb3f 100644
--- 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 1ad8f7fc1c..cb84f1f2c6 100644
--- 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 3e98813286..28ecaf6db2 100644
--- 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';
}
);