[Collab-qa-commits] r1139 - in buildstat/trunk/buildstat-server: . lib lib/SvnBuildStat lib/SvnBuildStat/Model script
goneri at alioth.debian.org
goneri at alioth.debian.org
Mon Aug 25 21:56:44 UTC 2008
Author: goneri
Date: 2008-08-25 21:56:43 +0000 (Mon, 25 Aug 2008)
New Revision: 1139
Modified:
buildstat/trunk/buildstat-server/Makefile.PL
buildstat/trunk/buildstat-server/lib/SvnBuildStat.pm
buildstat/trunk/buildstat-server/lib/SvnBuildStat/Common.pm
buildstat/trunk/buildstat-server/lib/SvnBuildStat/Model/DB.pm
buildstat/trunk/buildstat-server/script/svnbuildstat_import-new-report.pl
buildstat/trunk/buildstat-server/script/svnbuildstat_tarball.pl
buildstat/trunk/buildstat-server/script/svnbuildstat_update-bugs.pl
buildstat/trunk/buildstat-server/script/svnbuildstat_update-db-slow.pl
buildstat/trunk/buildstat-server/script/svnbuildstat_update-repository.pl
Log:
read the config file from /etc/buildstat-server/buildstat.ini
Modified: buildstat/trunk/buildstat-server/Makefile.PL
===================================================================
--- buildstat/trunk/buildstat-server/Makefile.PL 2008-08-25 21:56:05 UTC (rev 1138)
+++ buildstat/trunk/buildstat-server/Makefile.PL 2008-08-25 21:56:43 UTC (rev 1139)
@@ -1,7 +1,7 @@
use inc::Module::Install;
-name 'SvnBuildStat-WWW';
-all_from 'lib/SvnBuildStat/WWW.pm';
+name 'SvnBuildStat';
+all_from 'lib/SvnBuildStat.pm';
requires 'Catalyst' => '5.7007';
requires 'Catalyst::Plugin::ConfigLoader';
Modified: buildstat/trunk/buildstat-server/lib/SvnBuildStat/Common.pm
===================================================================
--- buildstat/trunk/buildstat-server/lib/SvnBuildStat/Common.pm 2008-08-25 21:56:05 UTC (rev 1138)
+++ buildstat/trunk/buildstat-server/lib/SvnBuildStat/Common.pm 2008-08-25 21:56:43 UTC (rev 1139)
@@ -78,7 +78,7 @@
return;
}
# TODO, no ini file access in a shared function
- my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "Can't load config file";
+ my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "Can't load config file";
my $vcscache = $cfg->val('path', 'vcscache');
my $watchfile = $vcscache.'/'.$$repositoryentry->repository_id->id.$$repositoryentry->subdir.'/debian/watch';
return unless -f $watchfile;
@@ -124,7 +124,7 @@
sub getTarballURLWithWatchfile {
my ($changelogentry) = shift;
- my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "can't load config file";
+ my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "can't load config file";
my $vcscache = $cfg->val('path', 'vcscache');
my $watchfile = $vcscache.'/'.$$changelogentry->repositoryentry_id->repository_id->id.$$changelogentry->repositoryentry_id->subdir.'/debian/watch';
@@ -339,7 +339,7 @@
#sub getSourceDirectory {
# my $changelogentry = shift;
#
-# my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "can't load config file";
+# my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "can't load config file";
# my $repositoryurl = $cfg->val('path', 'repositoryurl');
# my $repositorydir = $cfg->val('path', 'repositorydir');
#
@@ -371,7 +371,7 @@
my $resultdirectory = getBuildResultDirectory($build);
return unless $resultdirectory;
- my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "can't load config file";
+ my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "can't load config file";
#my $repositoryurl = $cfg->val('path', 'repositoryurl');
my $staticdir = $cfg->val('path', 'staticdir');
@@ -392,7 +392,7 @@
my $qajobDirectory = getQajobResultDirectory($qajob);
return unless $qajobDirectory;
- my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "can't load config file";
+ my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "can't load config file";
my $staticdir = $cfg->val('path', 'staticdir');
return $staticdir.'/files'.$qajobDirectory;
@@ -408,7 +408,7 @@
my $resultdirectory = getBuildResultDirectory($build);
return unless $resultdirectory;
- my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "can't load config file";
+ my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "can't load config file";
#my $repositoryurl = $cfg->val('path', 'repositoryurl');
my $staticdir = $cfg->val('path', 'staticdir');
Modified: buildstat/trunk/buildstat-server/lib/SvnBuildStat/Model/DB.pm
===================================================================
--- buildstat/trunk/buildstat-server/lib/SvnBuildStat/Model/DB.pm 2008-08-25 21:56:05 UTC (rev 1138)
+++ buildstat/trunk/buildstat-server/lib/SvnBuildStat/Model/DB.pm 2008-08-25 21:56:43 UTC (rev 1139)
@@ -5,7 +5,7 @@
use Config::IniFiles;
-my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "Can't load config file";
+my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "Can't load config file";
__PACKAGE__->config(
schema_class => 'SvnBuildStat::Schema',
Modified: buildstat/trunk/buildstat-server/lib/SvnBuildStat.pm
===================================================================
--- buildstat/trunk/buildstat-server/lib/SvnBuildStat.pm 2008-08-25 21:56:05 UTC (rev 1138)
+++ buildstat/trunk/buildstat-server/lib/SvnBuildStat.pm 2008-08-25 21:56:43 UTC (rev 1139)
@@ -28,7 +28,7 @@
# local deployment.
#__PACKAGE__->config(name => 'SvnBuildStat');
-__PACKAGE__->config('Plugin::ConfigLoader' => { file => $ENV{HOME}.'/.svnbuildstat.ini' } );
+__PACKAGE__->config('Plugin::ConfigLoader' => { file => '/etc/buildstat-server/buildstat.ini' } );
# Start the application
__PACKAGE__->setup;
Modified: buildstat/trunk/buildstat-server/script/svnbuildstat_import-new-report.pl
===================================================================
--- buildstat/trunk/buildstat-server/script/svnbuildstat_import-new-report.pl 2008-08-25 21:56:05 UTC (rev 1138)
+++ buildstat/trunk/buildstat-server/script/svnbuildstat_import-new-report.pl 2008-08-25 21:56:43 UTC (rev 1139)
@@ -286,7 +286,7 @@
}
-$cfg= Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "Can't load config file";
+$cfg= Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "Can't load config file";
$schema = SvnBuildStat::Schema->connect(
$cfg->val('db', 'dsn'),
$cfg->val('db', 'user'),
Modified: buildstat/trunk/buildstat-server/script/svnbuildstat_tarball.pl
===================================================================
--- buildstat/trunk/buildstat-server/script/svnbuildstat_tarball.pl 2008-08-25 21:56:05 UTC (rev 1138)
+++ buildstat/trunk/buildstat-server/script/svnbuildstat_tarball.pl 2008-08-25 21:56:43 UTC (rev 1139)
@@ -11,7 +11,7 @@
use LWP::Simple;
use File::Copy;
-my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "Can't load config file";
+my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "Can't load config file";
my $schema = SvnBuildStat::Schema->connect(
$cfg->val('db', 'dsn'),
$cfg->val('db', 'user'),
Modified: buildstat/trunk/buildstat-server/script/svnbuildstat_update-bugs.pl
===================================================================
--- buildstat/trunk/buildstat-server/script/svnbuildstat_update-bugs.pl 2008-08-25 21:56:05 UTC (rev 1138)
+++ buildstat/trunk/buildstat-server/script/svnbuildstat_update-bugs.pl 2008-08-25 21:56:43 UTC (rev 1139)
@@ -12,7 +12,7 @@
use SvnBuildStat::Schema;
-my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "Can't load config file";
+my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "Can't load config file";
my $schema = SvnBuildStat::Schema->connect(
$cfg->val('db', 'dsn'),
$cfg->val('db', 'user'),
Modified: buildstat/trunk/buildstat-server/script/svnbuildstat_update-db-slow.pl
===================================================================
--- buildstat/trunk/buildstat-server/script/svnbuildstat_update-db-slow.pl 2008-08-25 21:56:05 UTC (rev 1138)
+++ buildstat/trunk/buildstat-server/script/svnbuildstat_update-db-slow.pl 2008-08-25 21:56:43 UTC (rev 1139)
@@ -14,7 +14,7 @@
exit 1;
}
-my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "Can't load config file";
+my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "Can't load config file";
my $schema = SvnBuildStat::Schema->connect(
$cfg->val('db', 'dsn'),
$cfg->val('db', 'user'),
Modified: buildstat/trunk/buildstat-server/script/svnbuildstat_update-repository.pl
===================================================================
--- buildstat/trunk/buildstat-server/script/svnbuildstat_update-repository.pl 2008-08-25 21:56:05 UTC (rev 1138)
+++ buildstat/trunk/buildstat-server/script/svnbuildstat_update-repository.pl 2008-08-25 21:56:43 UTC (rev 1139)
@@ -19,7 +19,7 @@
#use DBIx::Class::QueryLog;
#use DBIx::Class::QueryLog::Analyzer;
-my $cfg = Config::IniFiles->new( -file => $ENV{HOME}."/.svnbuildstat.ini" ) or die "Can't load config file";
+my $cfg = Config::IniFiles->new( -file => "/etc/buildstat-server/buildstat.ini" ) or die "Can't load config file";
my $debmirror = $cfg->val('path', 'debmirror');
my $tmpdir = $cfg->val('path', 'tmpdir');
More information about the Collab-qa-commits
mailing list