Bump copyright to 2014

diff --git a/Bucardo.pm b/Bucardo.pm
index ca7c6579426dfb60e73282c76f133ebbd02ca397..a0336051b4fda64b8d15233ecdc332a3ce034ece 100644 (file)
--- a/Bucardo.pm
+++ b/Bucardo.pm
@@ -5,7 +5,7 @@
 ##
 ## This script should only be called via the 'bucardo' program
 ##
-## Copyright 2006-2013 Greg Sabino Mullane <greg@endpoint.com>
+## Copyright 2006-2014 Greg Sabino Mullane <greg@endpoint.com>
 ##
 ## Please visit http://bucardo.org for more information
 
@@ -223,7 +223,7 @@ sub new {
         created      => scalar localtime,
         mcppid       => $$,
         verbose      => 1,
-        logdest      => ['/var/log/bucardo'],
+        logdest      => ['.'],#'/var/log/bucardo'],
         warning_file => '',
         logseparate  => 0,
         logextension => '',
@@ -5014,6 +5014,7 @@ sub connect_database {
             $dsn .= join ';', map {
                 ($_ eq 'dbservice' ? 'service' : $_ ) . "=$d->{$_}";
             } grep { defined $d->{$_} and length $d->{$_} } qw/dbname dbservice/;
+            $self->glog("DDSSNN=$dsn");
         }
         elsif ('drizzle' eq $dbtype) {
             $dsn = "dbi:drizzle:database=$d->{dbname}";
@@ -5082,6 +5083,7 @@ sub connect_database {
 
     $self->glog("DSN: $dsn", LOG_NORMAL) if exists $config{log_level};
 
+warn "DSN=$dsn\n";
     $dbh = DBI->connect
         (
          $dsn,
@@ -9477,7 +9479,7 @@ Greg Sabino Mullane <greg@endpoint.com>
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright (c) 2005-2013 Greg Sabino Mullane <greg@endpoint.com>.
+Copyright (c) 2005-2014 Greg Sabino Mullane <greg@endpoint.com>.
 
 This software is free to use: see the LICENSE file for details.
 

diff --git a/Bucardo.pm.html b/Bucardo.pm.html
index db0c18976e728f8ab8baf66da7a52a049a54e30b..d665fb60ae7ae14ee9bc78e27eddb6bda0fc08be 100644 (file)
--- a/Bucardo.pm.html
+++ b/Bucardo.pm.html
@@ -101,7 +101,7 @@ of it in production since 2002. Jon Jensen &lt;<a href="mailto:jon@endpoint.com"
 </p>
 <hr />
 <h1><a name="license_and_copyright">LICENSE AND COPYRIGHT</a></h1>
-<p>Copyright (c) 2005-2013 Greg Sabino Mullane &lt;<a href="mailto:greg@endpoint.com">greg@endpoint.com</a>&gt;.</p>
+<p>Copyright (c) 2005-2014 Greg Sabino Mullane &lt;<a href="mailto:greg@endpoint.com">greg@endpoint.com</a>&gt;.</p>
 <p>This software is free to use: see the LICENSE file for details.</p>
 
 </body>

diff --git a/LICENSE b/LICENSE
index 35c1e12b3f4718dbc54fca7277d95deafcd70f02..4f49a339b84b0ec843f8d7c4dbad80e82a610ea9 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
   Greg Sabino Mullane <greg@endpoint.com>. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 

diff --git a/README b/README
index 65da147c41f591603004529ea5ba2e6bbb9c6471..7eb12f2ef0320cde93fd90198f0b5c9d7ac62f27 100644 (file)
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ THIS IS NOT A PRODUCTION RELEASE! This is a beta release of version 5.
 COPYRIGHT:
 ----------
 
-    Copyright (c) 2005-2013 Greg Sabino Mullane <greg@endpoint.com>
+    Copyright (c) 2005-2014 Greg Sabino Mullane <greg@endpoint.com>
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself, either Perl version 5.8.3 or,

diff --git a/bucardo b/bucardo
index 90031315d29c38da1c8c989aef1ffa6f49178851..2cdef173d780cad8cad6bf002da0080bb78bbd4c 100755 (executable)
--- a/bucardo
+++ b/bucardo
@@ -3,7 +3,7 @@
 
 ## Script to control Bucardo
 ##
-## Copyright 2006-2013 Greg Sabino Mullane <greg@endpoint.com>
+## Copyright 2006-2014 Greg Sabino Mullane <greg@endpoint.com>
 ##
 ## Please see http://bucardo.org/ for full documentation
 ##
@@ -11075,7 +11075,7 @@ Bucardo
 
 =head1 COPYRIGHT
 
-Copyright 2006-2013 Greg Sabino Mullane <greg@endpoint.com>
+Copyright 2006-2014 Greg Sabino Mullane <greg@endpoint.com>
 
 This program is free to use, subject to the limitations in the LICENSE file.
 

diff --git a/bucardo.html b/bucardo.html
index 626e5c688d69cb1b91a6bbd818df269c085ffafa..4d68a44330b36723b8c32068e12ea4ebffef0233 100644 (file)
--- a/bucardo.html
+++ b/bucardo.html
@@ -681,7 +681,7 @@ default. Optional.</p>
 <p>Boolean indicating whether or not to analyze the table after every sync. Off
 by default. Optional.</p>
 </dd>
-<dt><strong><a name="vaccuum_after_copy" class="item"><code>vaccuum_after_copy</code></a></strong></dt>
+<dt><strong><a name="vacuum_after_copy" class="item"><code>vacuum_after_copy</code></a></strong></dt>
 
 <dd>
 <p>Boolean indicating whether or not to vacuum the table after every sync. Off by
@@ -1757,7 +1757,7 @@ of which the table is a part.</p>
 <dd>
 <p>Boolean indicating whether or not to analyze the table after every sync.</p>
 </dd>
-<dt><strong><code>vaccuum_after_copy</code></strong></dt>
+<dt><strong><code>vacuum_after_copy</code></strong></dt>
 
 <dd>
 <p>Boolean indicating whether or not to vacuum the table after every sync.</p>
@@ -2427,7 +2427,7 @@ unless that file can be read.</p>
 </p>
 <hr />
 <h1><a name="copyright">COPYRIGHT</a></h1>
-<p>Copyright 2006-2013 Greg Sabino Mullane &lt;<a href="mailto:greg@endpoint.com">greg@endpoint.com</a>&gt;</p>
+<p>Copyright 2006-2014 Greg Sabino Mullane &lt;<a href="mailto:greg@endpoint.com">greg@endpoint.com</a>&gt;</p>
 <p>This program is free to use, subject to the limitations in the LICENSE file.</p>
 
 </body>

diff --git a/t/20-postgres.t b/t/20-postgres.t
index 203206add48caf048f6c19934ded459fdcb0b83b..c393fc3a11626ab4a2373bd6033d32ebcf3c4fc8 100644 (file)
--- a/t/20-postgres.t
+++ b/t/20-postgres.t
@@ -34,7 +34,7 @@ my $check_sequences_same = 1;
 
 ## We have to set up the PGSERVICEFILE early on, so the proper
 ## environment variable is set for all processes from the beginning.
-my ($fh, $service_temp_filename) = tempfile("bucardo_pgservice.tmp.XXXX", UNLINK => 0);
+my ($service_fh, $service_temp_filename) = tempfile("bucardo_pgservice.tmp.XXXX", UNLINK => 0);
 $ENV{PGSERVICEFILE} = getcwd . '/' . $service_temp_filename;
 
 plan tests => $single_tests +
@@ -70,8 +70,7 @@ $dbhX = $bct->setup_bucardo('A');
 for my $name (qw/ A B C D A1 /) {
     $t = "Adding database from cluster $name works";
     my ($dbuser,$dbport,$dbhost) = $bct->add_db_args($name);
-    my $status = $name eq 'E' ? 'inactive' : 'active';
-    $command = "bucardo add db $name dbname=bucardo_test user=$dbuser port=$dbport host=$dbhost status=$status";
+    $command = "bucardo add db $name dbname=bucardo_test user=$dbuser port=$dbport host=$dbhost status=active";
     $res = $bct->ctl($command);
     like ($res, qr/Added database "$name"/, $t);
 }
@@ -79,11 +78,13 @@ for my $name (qw/ A B C D A1 /) {
 ## Teach Bucardo about the fifth database using a service file
 $t = "Adding database E via a service name works";
 my ($dbuser,$dbport,$dbhost) = $bct->add_db_args('E');
-print $fh "[dbE]\ndbname=bucardo_test\nuser=$dbuser\nport=$dbport\nhost=$dbhost\n";
-close $fh;
-$res = $bct->ctl("add db E service=dbE");
+print $service_fh "[dbE]\ndbname=bucardo_test\nuser=$dbuser\nport=$dbport\nhost=$dbhost\n";
+close $service_fh;
+$res = $bct->ctl("add db E service=dbE status=inactive");
 like ($res, qr/Added database "E"/, $t);
 
+exit;
+
 ## Put all pk tables into a relgroup
 $t = q{Adding all PK tables on the master works};
 $res = $bct->ctl(q{bucardo add tables '*bucardo*test*' '*Bucardo*test*' db=A relgroup=allpk pkonly});