135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better checking of schema in daemon db

Browse Source
This commit is contained in:
Oliver Gorwits
2012-12-16 14:18:11 +00:00
parent 6d802f9b85
commit afc0f3b4bc
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Netdisco/bin/netdisco-daemon
View File

@@ -5,7 +5,7 @@ use Dancer::Plugin::DBIC 'schema';
use Daemon::Generic::While1; use Daemon::Generic::While1;
use Parallel::Prefork; use Parallel::Prefork;
use Sys::Hostname; use Net::Domain 'hostfqdn';
use Role::Tiny; use Role::Tiny;
use Try::Tiny; use Try::Tiny;
@@ -33,15 +33,26 @@ newdaemon(
logpriority => 'daemon.info', logpriority => 'daemon.info',
); );
# deploy the daemon's local DB schema
sub gd_preconfig { sub gd_preconfig {
my $self = shift; my $self = shift;
my $daemon = schema('daemon');
my $rs = schema('daemon')->resultset('Admin'); # deploy the daemon's local DB schema
try { $rs->first } try {
catch { schema('daemon')->deploy }; $daemon->storage->dbh_do(sub {
my ($storage, $dbh) = @_;
$dbh->selectrow_arrayref("SELECT * FROM admin WHERE 0 = 1");
});
}
catch { $daemon->deploy };
$self->{nd_host} = hostname; $daemon->storage->disconnect;
if ($daemon->get_db_version < $daemon->schema_version) {
$daemon->upgrade;
}
# used for locking jobs in central Pg queue
$self->{nd_host} = hostfqdn;
# do not remove this line - required by Daemon::Generic # do not remove this line - required by Daemon::Generic
return (); return ();