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

bug with txn_do in Manager worker

Browse Source
This commit is contained in:
Oliver Gorwits
2012-12-20 20:51:49 +00:00
parent 2ef08feb9c
commit b41115f173
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm
View File

@@ -20,11 +20,16 @@ sub worker_begin {
$dbh->selectrow_arrayref("SELECT * FROM admin WHERE 0 = 1"); $dbh->selectrow_arrayref("SELECT * FROM admin WHERE 0 = 1");
}); });
} }
catch { $daemon->txn_do( $daemon->deploy ) }; catch {
$daemon->txn_do(sub {
$daemon->storage->disconnect;
$daemon->deploy;
});
};
$daemon->storage->disconnect; $daemon->storage->disconnect;
if ($daemon->get_db_version < $daemon->schema_version) { if ($daemon->get_db_version < $daemon->schema_version) {
$daemon->txn_do( $daemon->upgrade ); $daemon->txn_do(sub { $daemon->upgrade });
} }
# on start, any jobs previously grabbed by a daemon on this host # on start, any jobs previously grabbed by a daemon on this host