Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/CHANGES 2012-07-20 12:10:13 UTC (rev 9594)
@@ -16,6 +16,7 @@
You can no longer edit a contact's username through the web UI, as this affects 3rd party systems (dashboard, reporting module, Nagvis)
Updated Nagios::Plugin and dependencies
Log the full query_host command into opsview-web.log if there is an error picked up
+ Updated Perl modules as of July 2012
NOTICES:
Opsview Web does not install new monitor packs on start - use install_all_opspacks command line utility
Renamed install_monitor_pack to install_opspack and create_monitor_pack to create_opspack
Modified: trunk/opsview-web/Makefile.PL
===================================================================
--- trunk/opsview-web/Makefile.PL 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/Makefile.PL 2012-07-20 12:10:13 UTC (rev 9594)
@@ -3,7 +3,7 @@
name 'Opsview-Web';
all_from 'lib/Opsview/Web.pm';
-requires Catalyst => '5.70';
+requires Catalyst => '5.90015';
requires 'YAML';
requires 'Template';
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Backup.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Backup.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Backup.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,7 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends qw/Catalyst::Controller::ActionRole/ }
+BEGIN { extends 'Catalyst::Controller' }
sub restore : Local : Args(1) : Does(ACL) : RequiresRole(ADMINACCESS) :
ACLDetachTo(/access_denied) :
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Hypergraph.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Hypergraph.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Hypergraph.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -25,7 +25,7 @@
use File::Slurp;
-BEGIN { extends 'Catalyst::Controller::ActionRole' }
+BEGIN { extends 'Catalyst::Controller' }
sub index : Path : Does(ACL) : RequiresRole(CONFIGUREVIEW) :
ACLDetachTo(/access_denied) :
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Reload.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Reload.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Reload.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -25,7 +25,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole' }
+BEGIN { extends 'Catalyst::Controller' }
use Opsview::Nagios;
use Opsview::Run;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Status.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Status.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Status.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,7 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole' }
+BEGIN { extends 'Catalyst::Controller' }
sub auto : Private {
my ( $self, $c ) = @_;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -24,7 +24,7 @@
use strict;
use warnings;
-use base qw/Catalyst::Controller/;
+use base 'Catalyst::Controller';
use Opsview::Utils qw(convert_to_arrayref);
@@ -161,22 +161,18 @@
}
}
-sub check_datetime : Local : Arg(0) : Does(ACL) : RequiredRole(CONFIGUREVIEW) :
+sub check_datetime : Local : Arg(0) : Does(ACL) : RequiresRole(CONFIGUREVIEW) :
ACLDetachTo(/access_denied) {
my ( $self, $c ) = @_;
- $c->log->debug( "in check_datetime" );
-
my $invalid = 0;
foreach my $p ( keys %{ $c->req->params } ) {
my $v = $c->req->param($p);
- $c->log->debug( "checking :$p: with val :$v:" );
if ( defined $v && Opsview::Common::parse_string($v) ) {
$invalid++;
}
}
- $c->log->debug( "invalid = $invalid" );
$c->stash( ResultSet => ( $invalid == 0 ? 0 : 1 ) );
$c->stash( output => "json" );
}
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Event.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Event.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Event.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -25,7 +25,7 @@
use Opsview::Common;
-BEGIN { extends 'Catalyst::Controller::ActionRole' }
+BEGIN { extends 'Catalyst::Controller' }
sub auto : Private {
my ( $self, $c, $id ) = @_;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Acknowledge.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Acknowledge.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Acknowledge.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -27,8 +27,7 @@
use Try::Tiny;
BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST',
+ extends 'Opsview::Web::ControllerBase::REST',
'Opsview::Web::ControllerBase::REST::NagiosAction';
}
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Downtime.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Downtime.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Downtime.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -26,8 +26,7 @@
use Opsview::Common;
BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST',
+ extends 'Opsview::Web::ControllerBase::REST',
'Opsview::Web::ControllerBase::REST::NagiosAction';
}
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Event.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Event.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Event.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,10 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
use Opsview::Utils
qw(convert_to_arrayref convert_state_to_text convert_host_state_to_text convert_state_type_to_text);
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Graph.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Graph.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Graph.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,10 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
use List::MoreUtils qw(uniq);
use Math::Round 'round';
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Recheck.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Recheck.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Recheck.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -27,8 +27,7 @@
use Try::Tiny;
BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST',
+ extends 'Opsview::Web::ControllerBase::REST',
'Opsview::Web::ControllerBase::REST::NagiosAction';
}
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Runtime/Performancemetric.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Runtime/Performancemetric.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Runtime/Performancemetric.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,10 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
use Opsview::Utils qw(convert_to_arrayref);
use List::MoreUtils qw(uniq);
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Runtime/Service.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Runtime/Service.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Runtime/Service.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,10 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
sub apply_restrictions : Private {
my ( $self, $c ) = @_;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Host.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Host.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Host.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,10 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
sub apply_restrictions : Private {
my ( $self, $c ) = @_;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Hostgroup.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Hostgroup.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Hostgroup.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,10 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
sub apply_restrictions : Private {
my ( $self, $c ) = @_;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Performancemetric.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Performancemetric.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Performancemetric.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,10 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
use Opsview::Utils
qw(convert_to_arrayref convert_state_to_text get_first_hash_key);
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Service.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Service.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Service.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,10 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
sub apply_restrictions : Private {
my ( $self, $c ) = @_;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Viewport.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Viewport.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status/Viewport.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,10 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
sub apply_restrictions : Private {
my ( $self, $c ) = @_;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Status.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -25,8 +25,7 @@
use Opsview::Common;
BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST',
+ extends 'Opsview::Web::ControllerBase::REST',
'Opsview::Web::ControllerBase::REST::NagiosAction';
}
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/User.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/User.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/User.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -26,10 +26,7 @@
use Opsview::Common;
use Try::Tiny;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
sub user : Chained("/rest/authenticated_root") : PathPart("user") : Args(0) :
ActionClass('REST') {
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -28,10 +28,7 @@
# at runtime
use Digest::SHA;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST'; }
# The api_version number is linked to the Opsview version number
# Increment this number when backwards compatibility is broken
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Root.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Root.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Root.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -60,8 +60,8 @@
$c->stash( functions => $f );
$c->stash->{stylesheets} = [];
$c->stash->{extra_javascript} = [];
- $c->stash->{debug} = $c->config->{static}->{debug};
- $c->stash->{useragent} = $c->request->headers->{"user-agent"};
+ $c->stash->{debug} = $c->config->{'Plugin::Static::Simple'}->{debug};
+ $c->stash->{useragent} = $c->request->headers->{"user-agent"};
$c->forward( "/set_language" );
$c->session_expires(1); # Reset the expiry for the session
$c->stash->{page_title} = "";
@@ -656,7 +656,7 @@
->( $server_status->status_update_time ) );
}
- for my $type ( qw( error warning notification ) ) {
+ for my $type (qw( error warning notification )) {
if ( $c->stash->{system_messages}
&& scalar @{ $c->stash->{system_messages}{$type} } )
{
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Search.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Search.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Search.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,7 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole' }
+BEGIN { extends 'Catalyst::Controller' }
sub auto : Private {
my ( $self, $c, $id ) = @_;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/State/Service.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/State/Service.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/State/Service.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -21,16 +21,21 @@
package Opsview::Web::Controller::State::Service;
use strict;
use warnings;
+use Moose;
+use namespace::autoclean;
+BEGIN { extends 'Catalyst::Controller' }
+
use MRO::Compat;
-use base qw(
- Opsview::Web::ControllerBase::Menus
- Opsview::Web::ControllerBase::Chained
- Opsview::Web::ControllerBase::State
- Opsview::Web::ControllerBase::Detail
- Opsview::Web::ControllerBase::Downtime
- Opsview::Web::ControllerBase::Service
-);
+# use base qw(
+# Opsview::Web::ControllerBase::Menus
+# Opsview::Web::ControllerBase::Chained
+# Opsview::Web::ControllerBase::State
+# Opsview::Web::ControllerBase::Detail
+# Opsview::Web::ControllerBase::Downtime
+# Opsview::Web::ControllerBase::Service
+# );
+
__PACKAGE__->config( model_name => "RuntimeDB::Service", );
sub anchor : PathPart('state/service') Chained('/') CaptureArgs(0) {
@@ -161,7 +166,7 @@
# Take some arguments to run a plug-in with, run it, and return the output.
sub exec : PathPart('exec') Chained('by_id') : Args(0) : Does(ACL) :
- AllowedRole(TESTSOME) : AllowedRole(TESTALL) {
+ AllowedRole(TESTSOME) : AllowedRole(TESTALL) : ACLDetachTo(/access_denied) {
my ( $self, $c ) = @_;
my $object = $c->stash->{object};
@@ -323,4 +328,5 @@
}
}
+__PACKAGE__->meta->make_immutable;
1;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Static.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Static.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Static.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,7 +23,7 @@
use strict;
use warnings;
-use base qw/Catalyst::Controller/;
+use base 'Catalyst::Controller';
#
# Server NMIS static content via catalyst when apache is bypassed
@@ -35,7 +35,8 @@
my $file_path = $c->req->path;
$file_path =~ s!static/nmis/!!;
$c->serve_static_file(
- $c->config->{static}->{nmis_path} . '/' . $file_path );
+ $c->config->{'Plugin::Static::Simple'}->{nmis_path} . '/'
+ . $file_path );
}
1;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Viewport/Summarystyle/tagcloud.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Viewport/Summarystyle/tagcloud.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Viewport/Summarystyle/tagcloud.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -47,6 +47,7 @@
$keyword->{name},
$c->uri_for( "/viewport", $keyword->{name} )->path,
$services,
+ {},
{
class => $keyword->{computed_state},
title => $c->loc(
Modified: trunk/opsview-web/lib/Opsview/Web/ControllerBase/Admin.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/ControllerBase/Admin.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/ControllerBase/Admin.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -30,7 +30,7 @@
use Opsview::Utils::Time;
use Data::Dump qw(dump);
-BEGIN { extends 'Catalyst::Controller::ActionRole' }
+BEGIN { extends 'Catalyst::Controller' }
__PACKAGE__->mk_accessors(
qw/model_name set_many set_many_words set_commasep null_if_empty
Modified: trunk/opsview-web/lib/Opsview/Web/ControllerBase/Config.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/ControllerBase/Config.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/ControllerBase/Config.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -26,10 +26,7 @@
use Try::Tiny;
use JSON;
-BEGIN {
- extends 'Catalyst::Controller::ActionRole',
- 'Opsview::Web::ControllerBase::REST';
-}
+BEGIN { extends 'Opsview::Web::ControllerBase::REST' }
__PACKAGE__->mk_accessors(
qw/
Modified: trunk/opsview-web/lib/Opsview/Web/ControllerBase/Reorder.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/ControllerBase/Reorder.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web/ControllerBase/Reorder.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -23,7 +23,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends qw/Catalyst::Controller::ActionRole/ }
+BEGIN { extends 'Catalyst::Controller' }
__PACKAGE__->mk_accessors(
qw/
Modified: trunk/opsview-web/lib/Opsview/Web.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web.pm 2012-07-20 11:45:14 UTC (rev 9593)
+++ trunk/opsview-web/lib/Opsview/Web.pm 2012-07-20 12:10:13 UTC (rev 9594)
@@ -47,7 +47,7 @@
# Session: session support (plus FastMmap storage and cookie state)
# Authentication: user login support + the CDBI/DBIC user store plugin
-use Catalyst::Log::Log4perl;
+use Log::Log4perl::Catalyst;
use Catalyst qw/ConfigLoader Static::Simple
Session Session::Store::DBI Session::State::Cookie
@@ -287,11 +287,12 @@
__PACKAGE__->config->{authentication}{http}{type} = "basic";
# Use these files from /usr/local/nagios/share
-__PACKAGE__->config->{static}->{dirs} =
+__PACKAGE__->config->{'Plugin::Static::Simple'}->{dirs} =
[qw/images stylesheets _javascript_ help media/];
-__PACKAGE__->config->{static}->{include_path} = ['/usr/local/nagios/share'];
-__PACKAGE__->config->{static}->{ignore_extensions} = [qw/tt/];
+__PACKAGE__->config->{'Plugin::Static::Simple'}->{include_path} =
+ ['/usr/local/nagios/share'];
+__PACKAGE__->config->{'Plugin::Static::Simple'}->{ignore_extensions} = [qw/tt/];
# General FastMmap cache - used by C::P::Snippets in snmpwalk
# Separate from session data (though also implemented as fastmmap)
@@ -341,7 +342,7 @@
# Create a Log4perl object
__PACKAGE__->log(
- Catalyst::Log::Log4perl->new( "$log4perlconf", watch_delay => 60, )
+ Log::Log4perl::Catalyst->new( "$log4perlconf", watch_delay => 60, )
);
# If debug is set (ie, run from dev server with -d), then change log4perl to use
