Consistently use app= in examples, and support appname=

Some of the usage examples used appname= in the prefix, but the code
didn't recognize that token. Use app= in all examples, and add appname=
to the prefix parser.

diff --git a/README b/README
index b20edd5afc04259e38e9fc7fa33f0f1fc04fb99d..b003e1e6e94aef1287b64b9dd69c3de8fad21d2d 100644 (file)
--- a/README
+++ b/README
@@ -175,7 +175,7 @@ SYNOPSIS
                             /pglog/postgresql-2012-08-21*
             perl pgbadger --prefix '%m %u@%d %p %r %a : ' /pglog/postgresql.log
             # Log line prefix with syslog log output
-            perl pgbadger --prefix 'user=%u,db=%d,client=%h,appname=%a' 
+            perl pgbadger --prefix 'user=%u,db=%d,client=%h,app=%a' 
                             /pglog/postgresql-2012-08-21*
             # Use my 8 CPUs to parse my 10GB file faster, much faster
             perl pgbadger -j 8 /pglog/postgresql-9.1-main.log

diff --git a/doc/pgBadger.pod b/doc/pgBadger.pod
index 4baf47436e3d419802cb982d772b1dad0c2c9563..14f0988d854522e55f849aa5f7a1f24e1c0c1fb7 100644 (file)
--- a/doc/pgBadger.pod
+++ b/doc/pgBadger.pod
@@ -176,7 +176,7 @@ Examples:
                        /pglog/postgresql-2012-08-21*
        perl pgbadger --prefix '%m %u@%d %p %r %a : ' /pglog/postgresql.log
        # Log line prefix with syslog log output
-       perl pgbadger --prefix 'user=%u,db=%d,client=%h,appname=%a' 
+       perl pgbadger --prefix 'user=%u,db=%d,client=%h,app=%a' 
                        /pglog/postgresql-2012-08-21*
        # Use my 8 CPUs to parse my 10GB file faster, much faster
        perl pgbadger -j 8 /pglog/postgresql-9.1-main.log

diff --git a/pgbadger b/pgbadger
index 3e0bb0e03e2e72b4561e64fb57609d006a7b7e84..c9b13c528fef117c0636e4aa3418e225ce420210 100755 (executable)
--- a/pgbadger
+++ b/pgbadger
@@ -864,7 +864,7 @@ if ($error_only && $disable_error) {
 my $regex_prefix_dbname = qr/(?:db|database)=([^,]*)/;
 my $regex_prefix_dbuser = qr/(?:user|usr)=([^,]*)/;
 my $regex_prefix_dbclient = qr/(?:client|remote|ip|host)=([^,\(]*)/;
-my $regex_prefix_dbappname = qr/(?:app|application)=([^,]*)/;
+my $regex_prefix_dbappname = qr/(?:app|application|appname)=([^,]*)/;
 
 # Set pattern to look for query type
 my $action_regex = qr/^[\s\(]*(DELETE|INSERT|UPDATE|SELECT|COPY|WITH|CREATE|DROP|ALTER|TRUNCATE|BEGIN|COMMIT|ROLLBACK|START|END|SAVEPOINT)/is;
@@ -1923,7 +1923,7 @@ Examples:
                        /pglog/postgresql-2012-08-21*
        perl pgbadger --prefix '%m %u@%d %p %r %a : ' /pglog/postgresql.log
        # Log line prefix with syslog log output
-       perl pgbadger --prefix 'user=%u,db=%d,client=%h,appname=%a' \
+       perl pgbadger --prefix 'user=%u,db=%d,client=%h,app=%a' \
                        /pglog/postgresql-2012-08-21*
        # Use my 8 CPUs to parse my 10GB file faster, much faster
        perl pgbadger -j 8 /pglog/postgresql-9.1-main.log