From 0b960cfae2d89e4bd3cdc1b56823ed34d90e5567 Mon Sep 17 00:00:00 2001
From: Sitaram Chamarty <sitaram@sita-lt.atc.tcs.com>
Date: Sun, 31 Jan 2010 23:10:12 +0530
Subject: [PATCH] auth/update-hook/pm: make &log() a common function

---
 src/gitolite.pm     |  6 ++++++
 src/gl-auth-command | 10 ++--------
 src/hooks/update    | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/gitolite.pm b/src/gitolite.pm
index d905a72..84dfc9a 100644
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@ -42,6 +42,12 @@ sub wrap_open {
     return $fh;
 }
 
+sub log_it {
+    open my $log_fh, ">>", $ENV{GL_LOG} or die "open log failed: $!\n";
+    print $log_fh @_;
+    close $log_fh or die "close log failed: $!\n";
+}
+
 # ----------------------------------------------------------------------------
 #       where is the rc file hiding?
 # ----------------------------------------------------------------------------
diff --git a/src/gl-auth-command b/src/gl-auth-command
index d6482ed..f494cc8 100755
--- a/src/gl-auth-command
+++ b/src/gl-auth-command
@@ -38,8 +38,7 @@ require "$bindir/gitolite.pm";
 &where_is_rc();
 die "parse $ENV{GL_RC} failed: "       . ($! or $@) unless do $ENV{GL_RC};
 
-# we need to pass GL_ADMINDIR and the bindir to the child hooks (well only the
-# admin repo's post-update hook but still...)
+# we need to pass GL_ADMINDIR and the bindir to the child hooks
 $ENV{GL_ADMINDIR} = $GL_ADMINDIR;
 $ENV{GL_BINDIR} = $bindir;
 
@@ -149,12 +148,7 @@ $GL_LOGT =~ s/%m/$m/g;
 $GL_LOGT =~ s/%d/$d/g;
 $ENV{GL_LOG} = $GL_LOGT;
 
-# if log failure isn't important enough to block access, get rid of all the
-# error checking
-open my $log_fh, ">>", $ENV{GL_LOG}
-    or die "open log failed: $!\n";
-print $log_fh "$ENV{GL_TS}\t$ENV{SSH_ORIGINAL_COMMAND}\t$user\n";
-close $log_fh or die "close log failed: $!\n";
+&log_it("$ENV{GL_TS}\t$ENV{SSH_ORIGINAL_COMMAND}\t$user\n");
 
 # ----------------------------------------------------------------------------
 #       over to git now
diff --git a/src/hooks/update b/src/hooks/update
index c1ff18f..a68ce18 100755
--- a/src/hooks/update
+++ b/src/hooks/update
@@ -33,6 +33,10 @@ die "parse $ENV{GL_RC} failed: "       . ($! or $@) unless do $ENV{GL_RC};
 # then "do" the compiled config file, whose name we now know
 die "parse $GL_CONF_COMPILED failed: " . ($! or $@) unless do $GL_CONF_COMPILED;
 
+# we've started to need some common subs in what used to be a small, cute,
+# little script that barely spanned a few lines :(
+require "$ENV{GL_BINDIR}/gitolite.pm";
+
 # ----------------------------------------------------------------------------
 #       start...
 # ----------------------------------------------------------------------------
@@ -118,11 +122,7 @@ check_ref($_) for @refs;
 
 # if we returned at all, all the checks succeeded, so we log the action and exit 0
 
-# logging note: if log failure isn't important enough to block pushes, get rid
-# of all the error checking
-open my $log_fh, ">>", $ENV{GL_LOG} or die "open log failed: $!\n";
-print $log_fh "$ENV{GL_TS}  $perm\t" .
+&log_it("$ENV{GL_TS}  $perm\t" .
     substr($oldsha, 0, 14) . "\t" . substr($newsha, 0, 14) .
-    "\t$ENV{GL_REPO}\t$ref\t$ENV{GL_USER}\t$log_refex\n";
-close $log_fh or die "close log failed: $!\n";
+    "\t$ENV{GL_REPO}\t$ref\t$ENV{GL_USER}\t$log_refex\n");
 exit 0;