clarify some log msgs and set web session_dir

This commit is contained in:
Oliver Gorwits
2013-02-24 21:06:20 +00:00
parent 13c7ee81ec
commit edfb0f3e24
4 changed files with 14 additions and 6 deletions

1
.gitignore vendored
View File

@@ -1,4 +1,5 @@
Netdisco/share/environments/* Netdisco/share/environments/*
Netdisco/share/sessions
Netdisco/logs/* Netdisco/logs/*
Netdisco/App-Netdisco-* Netdisco/App-Netdisco-*
*.swp *.swp

View File

@@ -25,17 +25,17 @@ sub worker_body {
# (will throw an exception) # (will throw an exception)
my $job = schema('daemon')->resultset('Admin') my $job = schema('daemon')->resultset('Admin')
->new_result($candidate); ->new_result($candidate);
my $jid = $job->id; my $jid = $job->job;
my $target = 'set_'. $job->action; my $target = 'set_'. $job->action;
next unless $self->can($target); next unless $self->can($target);
info "int ($wid): can ${target}() for job $jid"; debug "int ($wid): can ${target}() for job $jid";
# do job # do job
my ($status, $log); my ($status, $log);
try { try {
$job->started(scalar localtime); $job->started(scalar localtime);
debug sprintf "int (%s): starting job %s at %s", $wid, $jid, $job->started; info sprintf "int (%s): starting job %s at %s", $wid, $jid, $job->started;
($status, $log) = $self->$target($job); ($status, $log) = $self->$target($job);
} }
catch { catch {
@@ -44,7 +44,6 @@ sub worker_body {
$self->sendto('stderr', $log ."\n"); $self->sendto('stderr', $log ."\n");
}; };
info "int ($wid): wrapping up job $jid - status $status";
$self->close_job($job, $status, $log); $self->close_job($job, $status, $log);
} }
@@ -55,6 +54,9 @@ sub worker_body {
sub close_job { sub close_job {
my ($self, $job, $status, $log) = @_; my ($self, $job, $status, $log) = @_;
my $now = scalar localtime;
info sprintf "int (%s): wrapping up job %s - status %s at %s",
$self->wid, $job->job, $status, $now;
try { try {
schema('netdisco')->resultset('Admin') schema('netdisco')->resultset('Admin')
@@ -63,7 +65,7 @@ sub close_job {
status => $status, status => $status,
log => $log, log => $log,
started => $job->started, started => $job->started,
finished => \'now()', finished => $now,
}); });
} }
catch { $self->sendto('stderr', "error closing job: $_\n") }; catch { $self->sendto('stderr', "error closing job: $_\n") };

View File

@@ -15,6 +15,11 @@ use App::Netdisco::Web::Device;
use App::Netdisco::Web::TypeAhead; use App::Netdisco::Web::TypeAhead;
use App::Netdisco::Web::PortControl; use App::Netdisco::Web::PortControl;
# need to set at runtime the sessions dir in user home
# because YAML config (session_dir) cannot interpolate $ENV{HOME}
use Path::Class 'dir';
set('session_dir', dir($ENV{HOME}, 'netdisco-web-sessions'));
sub _load_web_plugins { sub _load_web_plugins {
my $plugin_list = shift; my $plugin_list = shift;

View File

@@ -15,7 +15,7 @@ layout: "main"
# about unicode within your app when this setting is set (recommended). # about unicode within your app when this setting is set (recommended).
charset: "UTF-8" charset: "UTF-8"
# web sessions stored in memory # web sessions stored on disk
session: "YAML" session: "YAML"
# logging format # logging format