no bug - reformat all the code using the new perltidy rules

2 files changed, 152 insertions, 153 deletions

diff --git a/Bugzilla/JobQueue/Runner.pm b/Bugzilla/JobQueue/Runner.pm
index 0177de40a..8d840fc75 100644
--- a/Bugzilla/JobQueue/Runner.pm
+++ b/Bugzilla/JobQueue/Runner.pm
@@ -48,206 +48,205 @@ our $initscript = 'bugzilla-queue';
 # only thing it uses from gd_preconfig is the "pidfile"
 # config parameter.
 sub gd_preconfig {
-    my $self = shift;
+  my $self = shift;
 
-    my $pidfile = $self->{gd_args}{pidfile};
-    if ( !$pidfile ) {
-        $pidfile = catfile(tmpdir(),  $self->{gd_progname} . '.pid');
-    }
-    return ( pidfile => $pidfile );
+  my $pidfile = $self->{gd_args}{pidfile};
+  if (!$pidfile) {
+    $pidfile = catfile(tmpdir(), $self->{gd_progname} . '.pid');
+  }
+  return (pidfile => $pidfile);
 }
 
 # All config other than the pidfile has to be done in gd_getopt
 # in order for it to be set up early enough.
 sub gd_getopt {
-    my $self = shift;
+  my $self = shift;
 
-    $self->SUPER::gd_getopt();
+  $self->SUPER::gd_getopt();
 
-    if ( $self->{gd_args}{progname} ) {
-        $self->{gd_progname} = $self->{gd_args}{progname};
-    }
-    else {
-        $self->{gd_progname} = basename($PROGRAM_NAME);
-    }
+  if ($self->{gd_args}{progname}) {
+    $self->{gd_progname} = $self->{gd_args}{progname};
+  }
+  else {
+    $self->{gd_progname} = basename($PROGRAM_NAME);
+  }
 
-    # There are places that Daemon Generic's new() uses $PROGRAM_NAME instead of
-    # gd_progname, which it really shouldn't, but this hack fixes it.
-    $self->{_original_program_name} = $PROGRAM_NAME;
+  # There are places that Daemon Generic's new() uses $PROGRAM_NAME instead of
+  # gd_progname, which it really shouldn't, but this hack fixes it.
+  $self->{_original_program_name} = $PROGRAM_NAME;
 
-    ## no critic (Variables::RequireLocalizedPunctuationVars)
-    $PROGRAM_NAME = $self->{gd_progname};
-    ## use critic
+  ## no critic (Variables::RequireLocalizedPunctuationVars)
+  $PROGRAM_NAME = $self->{gd_progname};
+  ## use critic
 }
 
 sub gd_postconfig {
-    my $self = shift;
+  my $self = shift;
 
-    # See the hack above in gd_getopt. This just reverses it
-    # in case anything else needs the accurate $0.
-    ## no critic (Variables::RequireLocalizedPunctuationVars)
-    $PROGRAM_NAME = delete $self->{_original_program_name};
-    ## use critic
+  # See the hack above in gd_getopt. This just reverses it
+  # in case anything else needs the accurate $0.
+  ## no critic (Variables::RequireLocalizedPunctuationVars)
+  $PROGRAM_NAME = delete $self->{_original_program_name};
+  ## use critic
 }
 
 sub gd_more_opt {
-    my $self = shift;
-    return (
-        'pidfile=s' => \$self->{gd_args}{pidfile},
-        'n=s'       => \$self->{gd_args}{progname},
-        'jobs|j=i'  => \$self->{gd_args}{jobs},
-    );
+  my $self = shift;
+  return (
+    'pidfile=s' => \$self->{gd_args}{pidfile},
+    'n=s'       => \$self->{gd_args}{progname},
+    'jobs|j=i'  => \$self->{gd_args}{jobs},
+  );
 }
 
 sub gd_usage {
-    pod2usage( { -verbose => 0, -exitval => 'NOEXIT' } );
-    return 0;
+  pod2usage({-verbose => 0, -exitval => 'NOEXIT'});
+  return 0;
 }
 
 sub gd_can_install {
-    my $self = shift;
+  my $self = shift;
+
+  my $source_file = "scripts/$initscript.rhel";
+  my $dest_file   = "$initd/$initscript";
+  my $sysconfig   = '/etc/sysconfig';
+  my $config_file = "$sysconfig/$initscript";
 
-    my $source_file = "scripts/$initscript.rhel";
-    my $dest_file   = "$initd/$initscript";
-    my $sysconfig   = '/etc/sysconfig';
-    my $config_file = "$sysconfig/$initscript";
+  if (!-x $chkconfig || !-d $initd) {
+    return $self->SUPER::gd_can_install(@_);
+  }
 
-    if ( !-x $chkconfig || !-d $initd ) {
-        return $self->SUPER::gd_can_install(@_);
+  return sub {
+    if (!-w $initd) {
+      print "You must run the 'install' command as root.\n";
+      return;
+    }
+    if (-e $dest_file) {
+      print "$initscript already in $initd.\n";
+    }
+    else {
+      copy($source_file, $dest_file)
+        or die "Could not copy $source_file to $dest_file: $!";
+      chmod 0755, $dest_file or die "Could not change permissions on $dest_file: $!";
     }
 
-    return sub {
-        if ( !-w $initd ) {
-            print "You must run the 'install' command as root.\n";
-            return;
-        }
-        if ( -e $dest_file ) {
-            print "$initscript already in $initd.\n";
-        }
-        else {
-            copy( $source_file, $dest_file )
-                or die "Could not copy $source_file to $dest_file: $!";
-            chmod 0755, $dest_file
-                or die "Could not change permissions on $dest_file: $!";
-        }
-
-        system $chkconfig, '--add', $initscript;
-        print "$initscript installed.", " To start the daemon, do \"$dest_file start\" as root.\n";
-
-        if ( -d $sysconfig and -w $sysconfig ) {
-            if ( -e $config_file ) {
-                print "$config_file already exists.\n";
-                return;
-            }
-
-            open my $config_fh, '>', $config_file;
-            my $directory = abs_path( dirname( $self->{_original_program_name} ) );
-            my $owner_id  = ( stat $self->{_original_program_name} )[4];
-            my $owner     = getpwuid $owner_id;
-            print $config_fh <<"END";
+    system $chkconfig, '--add', $initscript;
+    print "$initscript installed.",
+      " To start the daemon, do \"$dest_file start\" as root.\n";
+
+    if (-d $sysconfig and -w $sysconfig) {
+      if (-e $config_file) {
+        print "$config_file already exists.\n";
+        return;
+      }
+
+      open my $config_fh, '>', $config_file;
+      my $directory = abs_path(dirname($self->{_original_program_name}));
+      my $owner_id  = (stat $self->{_original_program_name})[4];
+      my $owner     = getpwuid $owner_id;
+      print $config_fh <<"END";
 #!/bin/sh
 BUGZILLA="$directory"
 USER=$owner
 END
-            close $config_fh;
-        }
-        else {
-            print "Please edit $dest_file to configure the daemon.\n";
-        }
-        }
+      close $config_fh;
+    }
+    else {
+      print "Please edit $dest_file to configure the daemon.\n";
+    }
+    }
 }
 
 sub gd_can_uninstall {
-    my $self = shift;
-
-    if ( -x $chkconfig and -d $initd ) {
-        return sub {
-            if ( !-e "$initd/$initscript" ) {
-                print "$initscript not installed.\n";
-                return;
-            }
-            system $chkconfig, '--del', $initscript;
-            print "$initscript disabled.", " To stop it, run: $initd/$initscript stop\n";
-            }
-    }
+  my $self = shift;
 
-    return $self->SUPER::gd_can_install(@_);
+  if (-x $chkconfig and -d $initd) {
+    return sub {
+      if (!-e "$initd/$initscript") {
+        print "$initscript not installed.\n";
+        return;
+      }
+      system $chkconfig, '--del', $initscript;
+      print "$initscript disabled.", " To stop it, run: $initd/$initscript stop\n";
+      }
+  }
+
+  return $self->SUPER::gd_can_install(@_);
 }
 
 sub gd_check {
-    my $self = shift;
-
-    # Get a count of all the jobs currently in the queue.
-    my $jq    = Bugzilla->job_queue();
-    my @dbs   = $jq->bz_databases();
-    my $count = 0;
-    foreach my $driver (@dbs) {
-        $count += $driver->select_one( 'SELECT COUNT(*) FROM ts_job', [] );
-    }
-    print get_text( 'job_queue_depth', { count => $count } ) . "\n";
+  my $self = shift;
+
+  # Get a count of all the jobs currently in the queue.
+  my $jq    = Bugzilla->job_queue();
+  my @dbs   = $jq->bz_databases();
+  my $count = 0;
+  foreach my $driver (@dbs) {
+    $count += $driver->select_one('SELECT COUNT(*) FROM ts_job', []);
+  }
+  print get_text('job_queue_depth', {count => $count}) . "\n";
 }
 
 # override this to use IO::Async.
 sub gd_setup_signals {
-    my $self    = shift;
-    my @signals = qw( INT HUP TERM );
-    $self->{_signal_future} = Future->wait_any( map { catch_signal( $_, $_ ) } @signals );
+  my $self    = shift;
+  my @signals = qw( INT HUP TERM );
+  $self->{_signal_future}
+    = Future->wait_any(map { catch_signal($_, $_) } @signals);
 }
 
 sub gd_other_cmd {
-    my ($self) = shift;
-    if ( $ARGV[0] eq 'once' ) {
-        Bugzilla::JobQueue::Worker->run('work_once');
-        exit;
-    }
+  my ($self) = shift;
+  if ($ARGV[0] eq 'once') {
+    Bugzilla::JobQueue::Worker->run('work_once');
+    exit;
+  }
 
-    $self->SUPER::gd_other_cmd();
+  $self->SUPER::gd_other_cmd();
 }
 
 sub gd_quit_event     { FATAL('gd_quit_event() should never be called') }
 sub gd_reconfig_event { FATAL('gd_reconfig_event() should never be called') }
 
 sub gd_run {
-    my $self      = shift;
-    my $jobs      = $self->{gd_args}{jobs} // 1;
-    my $signal_f  = $self->{_signal_future};
-    my $workers_f = fmap_void { $self->run_worker() }
-        concurrent => $jobs,
-        generate   => sub { !$signal_f->is_ready };
-
-    # This is so the process shows up in (h)top in a useful way.
-    local $PROGRAM_NAME = "$self->{gd_progname} [supervisor]";
-    Future->wait_any($signal_f, $workers_f)->get;
-    unlink $self->{gd_pidfile};
-    exit 0;
+  my $self      = shift;
+  my $jobs      = $self->{gd_args}{jobs} // 1;
+  my $signal_f  = $self->{_signal_future};
+  my $workers_f = fmap_void { $self->run_worker() }
+  concurrent => $jobs,
+    generate => sub { !$signal_f->is_ready };
+
+  # This is so the process shows up in (h)top in a useful way.
+  local $PROGRAM_NAME = "$self->{gd_progname} [supervisor]";
+  Future->wait_any($signal_f, $workers_f)->get;
+  unlink $self->{gd_pidfile};
+  exit 0;
 }
 
 # This executes the script "jobqueue-worker.pl"
 # $EXECUTABLE_NAME is the name of the perl interpreter.
 sub run_worker {
-    my ( $self ) = @_;
-
-    my $script = catfile( bz_locations->{cgi_path}, 'jobqueue-worker.pl' );
-    my @command = ( $EXECUTABLE_NAME, $script);
-    if ( $self->{gd_args}{progname} ) {
-        push @command, '--name' => "$self->{gd_args}{progname} [worker]";
-    }
-
-    my $loop   = IO::Async::Loop->new;
-    my $exit_f = $loop->new_future;
-    my $worker = IO::Async::Process->new(
-        command      => \@command,
-        on_finish    => on_finish($exit_f),
-        on_exception => on_exception( 'jobqueue worker', $exit_f )
-    );
-    $exit_f->on_cancel(
-        sub {
-            DEBUG('terminate worker');
-            $worker->kill('TERM');
-        }
-    );
-    $loop->add($worker);
-    return $exit_f;
+  my ($self) = @_;
+
+  my $script = catfile(bz_locations->{cgi_path}, 'jobqueue-worker.pl');
+  my @command = ($EXECUTABLE_NAME, $script);
+  if ($self->{gd_args}{progname}) {
+    push @command, '--name' => "$self->{gd_args}{progname} [worker]";
+  }
+
+  my $loop   = IO::Async::Loop->new;
+  my $exit_f = $loop->new_future;
+  my $worker = IO::Async::Process->new(
+    command      => \@command,
+    on_finish    => on_finish($exit_f),
+    on_exception => on_exception('jobqueue worker', $exit_f)
+  );
+  $exit_f->on_cancel(sub {
+    DEBUG('terminate worker');
+    $worker->kill('TERM');
+  });
+  $loop->add($worker);
+  return $exit_f;
 }
 
 1;
diff --git a/Bugzilla/JobQueue/Worker.pm b/Bugzilla/JobQueue/Worker.pm
index db8ebe35e..b0c0826eb 100644
--- a/Bugzilla/JobQueue/Worker.pm
+++ b/Bugzilla/JobQueue/Worker.pm
@@ -14,17 +14,17 @@ use Bugzilla::Logging;
 use Module::Runtime qw(require_module);
 
 sub run {
-    my ( $class, $fn ) = @_;
-    DEBUG("Starting up for $fn");
-    my $jq = Bugzilla->job_queue();
+  my ($class, $fn) = @_;
+  DEBUG("Starting up for $fn");
+  my $jq = Bugzilla->job_queue();
 
-    DEBUG('Loading jobqueue modules');
-    foreach my $module ( values %{ Bugzilla::JobQueue->job_map() } ) {
-        DEBUG("JobQueue can do $module");
-        require_module($module);
-        $jq->can_do($module);
-    }
-    $jq->$fn;
+  DEBUG('Loading jobqueue modules');
+  foreach my $module (values %{Bugzilla::JobQueue->job_map()}) {
+    DEBUG("JobQueue can do $module");
+    require_module($module);
+    $jq->can_do($module);
+  }
+  $jq->$fn;
 }
 
 1;