Merge pull request #982 from joyent/ether/v2-db-application_name

use the current pid, not the starting application's pid, in application_name

lib/Conch/Plugin/Database.pm

@@ -38,12 +38,12 @@ that persists for the lifetime of the application.
     my $_rw_schema;
     $app->helper(schema => sub ($c) {
         return $_rw_schema if $_rw_schema;
-        my $app_name = $c->app->moniker.'-'.$c->version_tag.' ('.$$.')';
+        my $app_name = $c->app->moniker.'-'.$c->version_tag;
         $_rw_schema = Conch::DB->connect(
             $db_credentials->@{qw(dsn username password)},
             +{
                 $db_credentials->{options}->%*,
-                on_connect_do => [ q{set application_name to '}.$app_name.q{'} ],
+                on_connect_do => [ sub {[q{set application_name to '}.$app_name.q{ (}.$$.q{)'}]} ],
             },
         );
     });
@@ -82,14 +82,14 @@ cleared with C<< ->txn_rollback >>; see L<DBD::Pg/"ReadOnly-(boolean)">.
         # see L<DBIx::Class::Storage::DBI/DBIx::Class and AutoCommit>
         local $ENV{DBIC_UNSAFE_AUTOCOMMIT_OK} = 1;
         return $_ro_schema if $_ro_schema;
-        my $app_name = $c->app->moniker.'-'.$c->version_tag.' ('.$$.')';
+        my $app_name = $c->app->moniker.'-'.$c->version_tag;
         $_ro_schema = Conch::DB->connect(
             $db_credentials->@{qw(dsn ro_username ro_password)},
             +{
                 $db_credentials->{options}->%*,
                 ReadOnly    => 1,
                 AutoCommit  => 0,
-                on_connect_do => [ q{set application_name to '}.$app_name.q{'} ],
+                on_connect_do => [ sub {[q{set application_name to '}.$app_name.q{ (}.$$.q{)'}]} ],
             },
         );
         $c->stash('ro_schema', $_ro_schema);