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

Use Path::Class for path and file name construction consistently

Browse Source
This commit is contained in:
Oliver Gorwits
2013-02-24 21:14:53 +00:00
parent edfb0f3e24
commit 981383c307
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -5,6 +5,7 @@
* random() and LIMIT the number of daemon jobs requested from Netdisco queue * random() and LIMIT the number of daemon jobs requested from Netdisco queue
* Remove Daemon's job queue DBIC schema from user config * Remove Daemon's job queue DBIC schema from user config
* Add log messages to the Daemon * Add log messages to the Daemon
* Use Path::Class for path and file name construction consistently
2.005000_002 - 2013-02-10 2.005000_002 - 2013-02-10

7
Netdisco/bin/netdisco-daemon
View File

@@ -2,11 +2,12 @@
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use Path::Class 'file';
BEGIN { BEGIN {
eval "use Daemon::Control"; eval "use Daemon::Control";
if ($@) { if ($@) {
exec("$ENV{HOME}/bin/localenv", $0, @ARGV); exec(file($ENV{HOME}, 'bin', 'localenv'), $0, @ARGV);
} }
} }
@@ -14,12 +15,12 @@ use Path::Class;
my $log_dir = dir($ENV{HOME}, 'logs'); my $log_dir = dir($ENV{HOME}, 'logs');
mkdir $log_dir if ! -d $log_dir; mkdir $log_dir if ! -d $log_dir;
my $program = "$ENV{HOME}/bin/netdisco-daemon-fg"; my $program = file($ENV{HOME}, 'bin', 'netdisco-daemon-fg');
Daemon::Control->new({ Daemon::Control->new({
name => 'Netdisco Daemon', name => 'Netdisco Daemon',
program => ($ENV{NETDISCO_DAEMON} || $program), program => ($ENV{NETDISCO_DAEMON} || $program),
pid_file => "$ENV{HOME}/netdisco-daemon.pid", pid_file => file($ENV{HOME}, 'netdisco-daemon.pid'),
stderr_file => file($log_dir, 'netdisco-daemon.log'), stderr_file => file($log_dir, 'netdisco-daemon.log'),
stdout_file => file($log_dir, 'netdisco-daemon.log'), stdout_file => file($log_dir, 'netdisco-daemon.log'),
})->run; })->run;

3
Netdisco/bin/netdisco-deploy
View File

@@ -14,6 +14,7 @@ use Term::ReadLine;
use Archive::Extract; use Archive::Extract;
use HTTP::Tiny; use HTTP::Tiny;
use Try::Tiny; use Try::Tiny;
use Path::Class 'file';
=head1 netdisco-deploy =head1 netdisco-deploy
@@ -108,7 +109,7 @@ sub deploy_oui {
sub deploy_mibs { sub deploy_mibs {
my $url = 'http://downloads.sourceforge.net/project/netdisco/netdisco-mibs/latest-snapshot/netdisco-mibs-snapshot.tar.gz'; my $url = 'http://downloads.sourceforge.net/project/netdisco/netdisco-mibs/latest-snapshot/netdisco-mibs-snapshot.tar.gz';
my $file = "$ENV{HOME}/netdisco-mibs-snapshot.tar.gz"; my $file = file($ENV{HOME}, 'netdisco-mibs-snapshot.tar.gz');
my $resp = HTTP::Tiny->new->mirror($url, $file); my $resp = HTTP::Tiny->new->mirror($url, $file);
if ($resp->{success}) { if ($resp->{success}) {

8
Netdisco/bin/netdisco-web
View File

@@ -2,23 +2,23 @@
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use Path::Class;
BEGIN { BEGIN {
eval "use Daemon::Control"; eval "use Daemon::Control";
if ($@) { if ($@) {
exec("$ENV{HOME}/bin/localenv", $0, @ARGV); exec(file($ENV{HOME}, 'bin', 'localenv'), $0, @ARGV);
} }
} }
use Path::Class;
my $log_dir = dir($ENV{HOME}, 'logs'); my $log_dir = dir($ENV{HOME}, 'logs');
mkdir $log_dir if ! -d $log_dir; mkdir $log_dir if ! -d $log_dir;
Daemon::Control->new({ Daemon::Control->new({
name => 'Netdisco Web', name => 'Netdisco Web',
program => 'plackup', program => 'plackup',
program_args => ["$ENV{HOME}/bin/netdisco-web-fg"], program_args => [file($ENV{HOME}, 'bin', 'netdisco-web-fg')],
pid_file => "$ENV{HOME}/netdisco-web.pid", pid_file => file($ENV{HOME}, 'netdisco-web.pid'),
stderr_file => file($log_dir, 'netdisco-web.log'), stderr_file => file($log_dir, 'netdisco-web.log'),
stdout_file => file($log_dir, 'netdisco-web.log'), stdout_file => file($log_dir, 'netdisco-web.log'),
})->run; })->run;

4
Netdisco/lib/App/Netdisco/Util/Connect.pm
View File

@@ -5,6 +5,7 @@ use Dancer::Plugin::DBIC 'schema';
use SNMP::Info; use SNMP::Info;
use Try::Tiny; use Try::Tiny;
use Path::Class 'dir';
use base 'Exporter'; use base 'Exporter';
our @EXPORT = (); our @EXPORT = ();
@@ -145,8 +146,7 @@ sub snmp_connect {
} }
sub _build_mibdirs { sub _build_mibdirs {
# FIXME: make this cross-platform (Path::Class?) return map { dir(setting('mibhome'), $_) }
return map { setting('mibhome') .'/'. $_ }
@{ setting('mibdirs') || [] }; @{ setting('mibdirs') || [] };
} }