diff --git a/lib/pause_2017/PAUSE/Web/Controller/Public.pm b/lib/pause_2017/PAUSE/Web/Controller/Public.pm index a9815d132..46ae90bb2 100644 --- a/lib/pause_2017/PAUSE/Web/Controller/Public.pm +++ b/lib/pause_2017/PAUSE/Web/Controller/Public.pm @@ -80,8 +80,9 @@ sub mailpw { # we have. unless ($email = $rec->{secretemail}) { my $u = $c->active_user_record($param,{hidden_user_ok => 1}); - require YAML::Syck; print STDERR "Line " . __LINE__ . ", File: " . __FILE__ . "\n" . YAML::Syck::Dump({u=>$u}); # XXX - + require YAML::Syck; + my $message = "Line " . __LINE__ . ", File: " . __FILE__ . "\n" . YAML::Syck::Dump({u=>$u}); + $mgr->log({level => 'debug', message => $message}); $email = $u->{email}; } if ($email) { diff --git a/lib/pause_2017/PAUSE/Web/Controller/Public/RequestId.pm b/lib/pause_2017/PAUSE/Web/Controller/Public/RequestId.pm index f1058ba7e..5ea014ceb 100644 --- a/lib/pause_2017/PAUSE/Web/Controller/Public/RequestId.pm +++ b/lib/pause_2017/PAUSE/Web/Controller/Public/RequestId.pm @@ -163,7 +163,9 @@ sub request { userid => $userid, rationale => $rationale, }; - require Data::Dumper; print STDERR "Line " . __LINE__ . ", File: " . __FILE__ . "\n" . Data::Dumper->new([$session->{APPLY}],[qw(APPLY)])->Indent(1)->Useqq(1)->Dump; # XXX + require Data::Dumper; + my $message = "Line " . __LINE__ . ", File: " . __FILE__ . "\n" . Data::Dumper->new([$session->{APPLY}],[qw(APPLY)])->Indent(1)->Useqq(1)->Dump; + $c->app->pause->log({level => 'debug', message => $message }); if (lc($fullname) eq lc($userid)) { die PAUSE::Web::Exception->new(ERROR => "fullname looks like spam"); } diff --git a/lib/pause_2017/PAUSE/Web/Controller/User/Distperms.pm b/lib/pause_2017/PAUSE/Web/Controller/User/Distperms.pm index 3bf77859d..fcc96716c 100644 --- a/lib/pause_2017/PAUSE/Web/Controller/User/Distperms.pm +++ b/lib/pause_2017/PAUSE/Web/Controller/User/Distperms.pm @@ -183,8 +183,9 @@ sub remove_dist_primary { if (0) { # here I discovered that Apache::Request has case-insensitive keys my %p = map { $_, [ $req->every_param($_)] } @{$req->param->names}; - require Data::Dumper; print STDERR "Line " . __LINE__ . ", File: " . __FILE__ . "\n" . Data::Dumper->new([\%p],[qw()])->Indent(1)->Useqq(1)->Dump; # XXX - + require Data::Dumper; + my $message = "Line " . __LINE__ . ", File: " . __FILE__ . "\n" . Data::Dumper->new([\%p],[qw()])->Indent(1)->Useqq(1)->Dump; + $c->app->pause->log({level => 'debug', message => $message}); } if ( diff --git a/lib/pause_2017/PAUSE/Web/Controller/User/Perms.pm b/lib/pause_2017/PAUSE/Web/Controller/User/Perms.pm index 9c3db8926..43972fa6d 100644 --- a/lib/pause_2017/PAUSE/Web/Controller/User/Perms.pm +++ b/lib/pause_2017/PAUSE/Web/Controller/User/Perms.pm @@ -283,8 +283,9 @@ sub _share_remopr { if (0) { # here I discovered that Apache::Request has case-insensitive keys my %p = map { $_, [ $req->every_param($_)] } @{$req->param->names}; - require Data::Dumper; print STDERR "Line " . __LINE__ . ", File: " . __FILE__ . "\n" . Data::Dumper->new([\%p],[qw()])->Indent(1)->Useqq(1)->Dump; # XXX - + require Data::Dumper; + my $message = "Line " . __LINE__ . ", File: " . __FILE__ . "\n" . Data::Dumper->new([\%p],[qw()])->Indent(1)->Useqq(1)->Dump; + $c->app->pause->log({level => 'debug', message => $message}); } if ( diff --git a/lib/pause_2017/PAUSE/Web/Plugin/WrapAction.pm b/lib/pause_2017/PAUSE/Web/Plugin/WrapAction.pm index bfb82240a..c7ced54fd 100644 --- a/lib/pause_2017/PAUSE/Web/Plugin/WrapAction.pm +++ b/lib/pause_2017/PAUSE/Web/Plugin/WrapAction.pm @@ -19,24 +19,25 @@ sub _wrap { } my $res = eval { $next->(); }; - if ($@) { - if (UNIVERSAL::isa($@, "PAUSE::Web::Exception")) { - if ($@->{ERROR}) { - $@->{ERROR} = [ $@->{ERROR} ] unless ref $@->{ERROR} eq 'ARRAY'; - push @{$pause->{ERROR}}, @{$@->{ERROR}}; + if (my $e = $@) { + if (UNIVERSAL::isa($e, "PAUSE::Web::Exception")) { + if ($e->{ERROR}) { + $e->{ERROR} = [ $e->{ERROR} ] unless ref $e->{ERROR} eq 'ARRAY'; + push @{$pause->{ERROR}}, @{$e->{ERROR}}; require Data::Dumper; - print STDERR "Line " . __LINE__ . ", File: " . __FILE__ . "\n" . Data::Dumper->new([$pause->{ERROR}],[qw(error)])->Indent(1)->Useqq(1)->Dump; # XXX - $c->res->code($@->{HTTP_STATUS}) if $@->{HTTP_STATUS}; + my $message = "Line " . __LINE__ . ", File: " . __FILE__ . "\n" . Data::Dumper->new([$pause->{ERROR}],[qw(error)])->Indent(1)->Useqq(1)->Dump; + $c->app->pause->log({level => 'debug', message => $message}); + $c->res->code($e->{HTTP_STATUS}) if $e->{HTTP_STATUS}; $c->render('layouts/layout') unless $c->stash('Action'); - } elsif ($@->{HTTP_STATUS}) { + } elsif ($e->{HTTP_STATUS}) { $c->res->headers->content_type('text/plain'); - $c->res->body(status_message($@->{HTTP_STATUS})); - $c->rendered($@->{HTTP_STATUS}); + $c->res->body(status_message($e->{HTTP_STATUS})); + $c->rendered($e->{HTTP_STATUS}); return; } } else { # this is NOT a known error type, we need to handle it anon - my $error = "$@"; + my $error = "$e"; if ($pause->{ERRORS_TO_BROWSER}) { push @{$pause->{ERROR}}, " ", $error; } else {