[Nix-commits] SVN commit: nix - r26193 - in hydra/trunk/src: lib/Hydra/Helper script

[Rob Vermaas]

Author: rob
Date: Mon Mar  7 15:06:32 2011
New Revision: 26193
URL: https://svn.nixos.org/websvn/nix/?rev=26193&sc=1

Log:
use HYDRA_DATA/hydra.conf as default location for hydra.conf

Modified:
   hydra/trunk/src/lib/Hydra/Helper/Nix.pm
   hydra/trunk/src/script/hydra_build.pl.in
   hydra/trunk/src/script/hydra_evaluator.pl.in

Modified: hydra/trunk/src/lib/Hydra/Helper/Nix.pm
==============================================================================
--- hydra/trunk/src/lib/Hydra/Helper/Nix.pm     Mon Mar  7 13:55:43 2011        
(r26192)
+++ hydra/trunk/src/lib/Hydra/Helper/Nix.pm     Mon Mar  7 15:06:32 2011        
(r26193)
@@ -10,7 +10,7 @@
 our @ISA = qw(Exporter);
 our @EXPORT = qw(
     isValidPath
-    getHydraPath getHydraDBPath openHydraDB txn_do
+    getHydraPath getHydraDBPath openHydraDB getHydraConf txn_do
     registerRoot getGCRootsDir gcRootFor
     getPrimaryBuildsForView 
     getPrimaryBuildTotal
@@ -25,10 +25,16 @@
 
 sub getHydraPath {
     my $dir = $ENV{"HYDRA_DATA"} || "/var/lib/hydra";
-    die "The HYDRA_DATA directory does not exist!\n" unless -d $dir;
+    die "The HYDRA_DATA directory ($dir) does not exist!\n" unless -d $dir;
     return $dir;
 }
 
+sub getHydraConf {
+    my $conf = $ENV{"HYDRA_CONF"} || (getHydraPath . "/hydra.conf");
+    die "The HYDRA_CONF file ($conf) does not exist!\n" unless -f $conf;
+    return $conf;
+}
+
 
 sub getHydraDBPath {
     my $db = $ENV{"HYDRA_DBI"};

Modified: hydra/trunk/src/script/hydra_build.pl.in
==============================================================================
--- hydra/trunk/src/script/hydra_build.pl.in    Mon Mar  7 13:55:43 2011        
(r26192)
+++ hydra/trunk/src/script/hydra_build.pl.in    Mon Mar  7 15:06:32 2011        
(r26193)
@@ -23,8 +23,7 @@
 my $db = openHydraDB;
 
 
-my %config = new Config::General($ENV{"HYDRA_CONFIG"})->getall;
-
+my %config = new Config::General(getHydraConf)->getall;
 
 sub sendTwitterNotification {
     my ($build) = @_;

Modified: hydra/trunk/src/script/hydra_evaluator.pl.in
==============================================================================
--- hydra/trunk/src/script/hydra_evaluator.pl.in        Mon Mar  7 13:55:43 
2011        (r26192)
+++ hydra/trunk/src/script/hydra_evaluator.pl.in        Mon Mar  7 15:06:32 
2011        (r26193)
@@ -18,7 +18,7 @@
 STDOUT->autoflush();
 
 my $db = openHydraDB;
-my %config = new Config::General($ENV{"HYDRA_CONFIG"})->getall;
+my %config = new Config::General(getHydraConf)->getall;
 
 
 sub fetchInputs {
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits