Slight refactor

lib/Troglodyne/API/Postgres.pm

@@ -71,161 +71,163 @@ sub start_postgres_install {
     # OK. We are logging, now return the log loc after kicking it off.
     # Yeah, yeah, I'm forking twice. who cares
     require Cpanel::Daemonizer::Tiny;
-    my $install = sub {
-        my ( $ver2install, $log ) = @_;
+    my $pid = Cpanel::Daemonizer::Tiny::run_as_daemon( &_real_install, $version, $lgg );
+    symlink( $pid, "$dir/INSTALL_IN_PROGRESS" ) if $pid;
+    return {
+        'log' => $lgg,
+        'pid' => $pid,
+    };
+}
 
-        my $no_period_version = $ver2install =~ s/\.//r;
-        my @RPMS = (
-            "postgresql$no_period_version",
-            "postgresql$no_period_version-server",
-        );
-        # TODO: Use Cpanel::Yum::Install based module, let all that stuff handle this "for you".
-        open( my $lh, ">", $lgg ) or do {
-            _cleanup("255");
-            return;
+sub _real_install {
+    my ( $ver2install, $log ) = @_;
+
+    my $no_period_version = $ver2install =~ s/\.//r;
+    my @RPMS = (
+        "postgresql$no_period_version",
+        "postgresql$no_period_version-server",
+    );
+    # TODO: Use Cpanel::Yum::Install based module, let all that stuff handle this "for you".
+    open( my $lh, ">", $lgg ) or do {
+        _cleanup("255");
+        return;
+    };
+    print $lh "Beginning install...\n";
+
+    # Check for CCS. Temporarily disable it if so.
+    require Cpanel::RPM;
+    my $ccs_installed = Cpanel::RPM->get_version('cpanel-ccs-calendarserver');
+    $ccs_installed = $ccs_installed->{'cpanel-ccs-calendarserver'};
+    if($ccs_installed) {
+        print $lh "\ncpanel-ccs-calendarserver is installed.\nDisabling the service while the upgrade is in process.\n\n";
+        require Whostmgr::Services;
+        Whostmgr::Services::disable('cpanel-ccs');
+    }
+
+    require Cpanel::SafeRun::Object;
+    my $exit = _saferun( $lh, 'yum', qw{install -y}, @RPMS );
+    return _cleanup("$exit") if $exit;
+
+    # Init the DB
+    require Cpanel::AccessIds::ReducedPrivileges;
+    {
+        my $pants_on_the_ground = Cpanel::AccessIds::ReducedPrivileges->new('postgres');
+        $exit = _saferun( $lh, "/usr/pgsql-$ver2install/bin/initdb", '-D', "/var/lib/pgsql/$ver2install/data/" );
+    }
+    return _cleanup("$exit") if $exit;
+
+    require File::Slurper;
+    # Move some bullcrap out of the way if we're on old PGs
+    my @cur_ver = ( Cpanel::PostgresUtils::get_version() );
+    my $str_ver = join( '.', @cur_ver );
+    if( $str_ver + 0 < 9.4 ) {
+        print $lh "\n\nInstalled version is less than 9.4 ($str_ver), Implementing workaround in pg_ctl to ensure pg_upgrade works...\n";
+        require File::Copy;
+        print $lh "Backing up /usr/bin/pg_ctl to /usr/bin/pg_ctl.orig\n";
+        File::Copy::copy('/usr/bin/pg_ctl','/usr/bin/pg_ctl.orig') or do {
+            print $lh "Backup of /usr/bin/pg_ctl to /usr/bin/pg_ctl.orig failed: $!\n";
+            return _cleanup("255");
         };
 
-        # Check for CCS. Temporarily disable it if so.
-        require Cpanel::RPM;
-        my $ccs_installed = Cpanel::RPM->get_version('cpanel-ccs-calendarserver');
-        $ccs_installed = $ccs_installed->{'cpanel-ccs-calendarserver'};
-        if($ccs_installed) {
-            print $lh "\ncpanel-ccs-calendarserver is installed.\nDisabling the service while the upgrade is in process.\n\n";
-            require Whostmgr::Services;
-            Whostmgr::Services::disable('cpanel-ccs');
-        }
+        my $pg_ctl_contents = File::Slurper::read_text("/usr/bin/pg_ctl");
+        $pg_ctl_contents =~ s/unix_socket_directory/unix_socket_directories/g;
+        File::Slurper::write_text("/usr/bin/pg_ctl");
+        print $lh "Workaround should be in place now. Proceeding with pg_upgrade.\n\n";
+    }
 
-        require Cpanel::SafeRun::Object;
-        my $exit = _saferun( $lh, 'yum', qw{install -y}, @RPMS );
-        return _cleanup("$exit") if $exit;
+    # Upgrade the cluster
+    # /usr/pgsql-9.6/bin/pg_upgrade --old-datadir /var/lib/pgsql/data/ --new-datadir /var/lib/pgsql/9.6/data/ --old-bindir /usr/bin/ --new-bindir /usr/pgsql-9.6/bin/
+    my ( $old_datadir, $old_bindir ) = ( $str_ver + 0 < 9.5 ) ? ( '/var/lib/pgsql/data', '/usr/bin' ) : ( "/var/lib/pgsql/$str_ver/data/", "/usr/pgsql-$str_ver/bin/" );
+    $exit = _saferun( $lh, "/usr/pgsql-$ver2install/bin/pg_upgrade",
+            '--old-datadir', $old_datadir,
+            '--new-datadir', "/var/lib/pgsql/$ver2install/data/",
+            '--old-bindir', $old_bindir,
+            '--new_bindir', "/usr/pgsql-$ver2install/bin/",
+    );
+    return _cleanup("$exit") if $exit;
+
+    # Start the server.
+    $exit = _saferun( $lh, qw{systemctl start}, "postgresql-$ver2install" );
+    return _cleanup("$exit") if $exit;
+
+    if( $ccs_installed ) {
+        print $lh "\n\nNow upgrading PG cluster for cpanel-ccs-calendarserver...\n";
+        my $ccs_pg_datadir = '/opt/cpanel-ccs/data/Data/Database/cluster';
+        print $lh "Old PG datadir is being moved to '$ccs_pg_datadir.old'...\n";
+        rename( $ccs_pg_datadir, "$ccs_pg_datadir.old" );
+        mkdir($ccs_pg_datadir);
 
         # Init the DB
-        require Cpanel::AccessIds::ReducedPrivileges;
         {
-            my $pants_on_the_ground = Cpanel::AccessIds::ReducedPrivileges->new('postgres');
-            $exit = _saferun( $lh, "/usr/pgsql-$ver2install/bin/initdb", '-D', "/var/lib/pgsql/$ver2install/data/" );
-        }
-        return _cleanup("$exit") if $exit;
-
-        require File::Slurper;
-        # Move some bullcrap out of the way if we're on old PGs
-        my @cur_ver = ( Cpanel::PostgresUtils::get_version() );
-        my $str_ver = join( '.', @cur_ver );
-        if( $str_ver + 0 < 9.4 ) {
-            print $lh "\n\nInstalled version is less than 9.4 ($str_ver), Implementing workaround in pg_ctl to ensure pg_upgrade works...\n";
-            require File::Copy;
-            print $lh "Backing up /usr/bin/pg_ctl to /usr/bin/pg_ctl.orig\n";
-            File::Copy::copy('/usr/bin/pg_ctl','/usr/bin/pg_ctl.orig') or do {
-                print $lh "Backup of /usr/bin/pg_ctl to /usr/bin/pg_ctl.orig failed: $!\n";
-                return _cleanup("255");
-            };
-
-            my $pg_ctl_contents = File::Slurper::read_text("/usr/bin/pg_ctl");
-            $pg_ctl_contents =~ s/unix_socket_directory/unix_socket_directories/g;
-            File::Slurper::write_text("/usr/bin/pg_ctl");
-            print $lh "Workaround should be in place now. Proceeding with pg_upgrade.\n\n";
+            local $ENV{'PGSETUP_INITDB_OPTIONS'} = "-U caldav --locale=C -E=UTF8";
+            $exit = _saferun( $lh, "/usr/pgsql-$ver2install/bin/initdb", '-D', $ccs_pg_datadir );
+            return _cleanup("$exit") if $exit;
         }
 
-        # Upgrade the cluster
-        # /usr/pgsql-9.6/bin/pg_upgrade --old-datadir /var/lib/pgsql/data/ --new-datadir /var/lib/pgsql/9.6/data/ --old-bindir /usr/bin/ --new-bindir /usr/pgsql-9.6/bin/
-        my ( $old_datadir, $old_bindir ) = ( $str_ver + 0 < 9.5 ) ? ( '/var/lib/pgsql/data', '/usr/bin' ) : ( "/var/lib/pgsql/$str_ver/data/", "/usr/pgsql-$str_ver/bin/" );
+        # Upgrade the DB
         $exit = _saferun( $lh, "/usr/pgsql-$ver2install/bin/pg_upgrade",
-                '--old-datadir', $old_datadir,
-                '--new-datadir', "/var/lib/pgsql/$ver2install/data/",
-                '--old-bindir', $old_bindir,
-                '--new_bindir', "/usr/pgsql-$ver2install/bin/",
+            '--old-datadir', "$ccs_pg_datadir.old",
+            '--new-datadir', $ccs_pg_datadir,
+            '--old-bindir', $old_bindir,
+            '--new_bindir', "/usr/pgsql-$ver2install/bin/",
+            qw{-c -U caldav},
         );
         return _cleanup("$exit") if $exit;
+    }
 
-        # Start the server.
-        $exit = _saferun( $lh, qw{systemctl start}, "postgresql-$ver2install" );
-        return _cleanup("$exit") if $exit;
-
-        if( $ccs_installed ) {
-            print $lh "\n\nNow upgrading PG cluster for cpanel-ccs-calendarserver...\n";
-            my $ccs_pg_datadir = '/opt/cpanel-ccs/data/Data/Database/cluster';
-            print $lh "Old PG datadir is being moved to '$ccs_pg_datadir.old'...\n";
-            rename( $ccs_pg_datadir, "$ccs_pg_datadir.old" );
-            mkdir($ccs_pg_datadir);
-
-            # Init the DB
-            {
-                local $ENV{'PGSETUP_INITDB_OPTIONS'} = "-U caldav --locale=C -E=UTF8";
-                $exit = _saferun( $lh, "/usr/pgsql-$ver2install/bin/initdb", '-D', $ccs_pg_datadir );
-                return _cleanup("$exit") if $exit;
-            }
-
-            # Upgrade the DB
-            $exit = _saferun( $lh, "/usr/pgsql-$ver2install/bin/pg_upgrade",
-                '--old-datadir', "$ccs_pg_datadir.old",
-                '--new-datadir', $ccs_pg_datadir,
-                '--old-bindir', $old_bindir,
-                '--new_bindir', "/usr/pgsql-$ver2install/bin/",
-                qw{-c -U caldav},
-            );
-            return _cleanup("$exit") if $exit;
-        }
-
-        if( $str_ver + 0 < 9.4 ) {
-            print $lh "\n\nWorkaround resulted in successful start of the server. Reverting workaround changes to pg_ctl...\n\n";
-            rename( '/usr/bin/pg_ctl.orig', '/usr/bin/pg_ctl' ) or do {
-                print $lh "Restore of /usr/bin/pg_ctl.orig to /usr/bin/pg_ctl failed: $!\n";
-                return _cleanup("255");
-            };
-        }
+    if( $str_ver + 0 < 9.4 ) {
+        print $lh "\n\nWorkaround resulted in successful start of the server. Reverting workaround changes to pg_ctl...\n\n";
+        rename( '/usr/bin/pg_ctl.orig', '/usr/bin/pg_ctl' ) or do {
+            print $lh "Restore of /usr/bin/pg_ctl.orig to /usr/bin/pg_ctl failed: $!\n";
+            return _cleanup("255");
+        };
+    }
 
-        print $lh "\n\nNow cleaning up old postgresql version...\n";
-        my $svc2remove = ( $str_ver + 0 < 9.5 ) ? 'postgresql' : "postgresql-$str_ver";
-        $exit = _saferun( $lh, qw{systemctl disable}, $svc2remove );
+    print $lh "\n\nNow cleaning up old postgresql version...\n";
+    my $svc2remove = ( $str_ver + 0 < 9.5 ) ? 'postgresql' : "postgresql-$str_ver";
+    $exit = _saferun( $lh, qw{systemctl disable}, $svc2remove );
+    return _cleanup("$exit") if $exit;
+    $exit = _saferun( $lh, qw{yum -y remove}, $svc2remove );
+    return _cleanup("$exit") if $exit;
+
+    print $lh "\n\nNow enabling postgresql-$ver2install on startup...\n";
+    $exit = _saferun( $lh, qw{systemctl enable}, "postgresql-$ver2install" );
+    return _cleanup("$exit") if $exit;
+
+    # Update alternatives. Should be fine to use --auto, as no other alternatives will exist for the installed version.
+    # Create alternatives for pg_ctl, etc. as those don't get made by the RPM.
+    print $lh "\n\nUpdating alternatives to ensure the newly installed version is considered canonical...\n";
+    my @normie_alts = qw{pg_ctl initdb pg_config pg_upgrade};
+    my @manual_alts = qw{clusterdb createdb createuser dropdb droplang dropuser pg_basebackup pg_dump pg_dumpall pg_restore psql psql-reindexdb vaccumdb};
+    foreach my $alt ( @normie_alts ) {
+        $exit = _saferun( $lh, qw{update-alternatives --install}, "/usr/bin/$alt", "pgsql-$alt", "/usr/pgsql-$ver2install/bin/$alt", "50" );
         return _cleanup("$exit") if $exit;
-        $exit = _saferun( $lh, qw{yum -y remove}, $svc2remove );
+        $exit = _saferun( $lh, qw{update-alternatives --auto}, "pgsql-$alt" );
         return _cleanup("$exit") if $exit;
-
-        print $lh "\n\nNow enabling postgresql-$ver2install on startup...\n";
-        $exit = _saferun( $lh, qw{systemctl enable}, "postgresql-$ver2install" );
+    }
+    foreach my $alt ( @manual_alts ) {
+        $exit = _saferun( $lh, qw{update-alternatives --auto}, "pgsql-$alt" );
         return _cleanup("$exit") if $exit;
+        $exit = _saferun( $lh, qw{update-alternatives --auto}, "pgsql-${alt}man" );
+        return _cleanup("$exit") if $exit;
+    }
 
-        # Update alternatives. Should be fine to use --auto, as no other alternatives will exist for the installed version.
-        # Create alternatives for pg_ctl, etc. as those don't get made by the RPM.
-        print $lh "\n\nUpdating alternatives to ensure the newly installed version is considered canonical...\n";
-        my @normie_alts = qw{pg_ctl initdb pg_config pg_upgrade};
-        my @manual_alts = qw{clusterdb createdb createuser dropdb droplang dropuser pg_basebackup pg_dump pg_dumpall pg_restore psql psql-reindexdb vaccumdb};
-        foreach my $alt ( @normie_alts ) {
-            $exit = _saferun( $lh, qw{update-alternatives --install}, "/usr/bin/$alt", "pgsql-$alt", "/usr/pgsql-$ver2install/bin/$alt", "50" );
-            return _cleanup("$exit") if $exit;
-            $exit = _saferun( $lh, qw{update-alternatives --auto}, "pgsql-$alt" );
-            return _cleanup("$exit") if $exit;
-        }
-        foreach my $alt ( @manual_alts ) {
-            $exit = _saferun( $lh, qw{update-alternatives --auto}, "pgsql-$alt" );
-            return _cleanup("$exit") if $exit;
-            $exit = _saferun( $lh, qw{update-alternatives --auto}, "pgsql-${alt}man" );
-            return _cleanup("$exit") if $exit;
-        }
-
-        print $lh "\n\nWriting new .bash_profile for the 'postgres' user...\n";
-        my $bash_profile = "[ -f /etc/profile ] && source /etc/profile
+    print $lh "\n\nWriting new .bash_profile for the 'postgres' user...\n";
+    my $bash_profile = "[ -f /etc/profile ] && source /etc/profile
 PGDATA=/var/lib/pgsql/$ver2install/data
 export PGDATA
 [ -f /var/lib/pgsql/.pgsql_profile ] && source /var/lib/pgsql/.pgsql_profile
 export PATH=\$PATH:/usr/pgsql-$ver2install/bin\n";
-        File::Slurper::write_text( '/var/lib/pgsql/.bash_profile', $bash_profile );
+    File::Slurper::write_text( '/var/lib/pgsql/.bash_profile', $bash_profile );
 
-        if($ccs_installed) {
-            File::Slurper::write_text( '/opt/cpanel-ccs/.bash_profile', $bash_profile );
-            print $lh "\nRe-Enabling cpanel-ccs-calendarserver...\n\n";
-            require Whostmgr::Services;
-            Whostmgr::Services::enable('cpanel-ccs');
-        }
+    if($ccs_installed) {
+        File::Slurper::write_text( '/opt/cpanel-ccs/.bash_profile', $bash_profile );
+        print $lh "\nRe-Enabling cpanel-ccs-calendarserver...\n\n";
+        require Whostmgr::Services;
+        Whostmgr::Services::enable('cpanel-ccs');
+    }
 
-        return _cleanup("0");
-    };
-    my $pid = Cpanel::Daemonizer::Tiny::run_as_daemon( $install, $version, $lgg );
-    symlink( $pid, "$dir/INSTALL_IN_PROGRESS" );
-    return {
-        'log' => $lgg,
-        'pid' => $pid,
-    };
+    return _cleanup("0");
 }
 
 sub _saferun {