Changeset 14

Timestamp:

10/04/07 22:35:39 (6 years ago)

Author:

jesus

Message:

fixes #7

Files:

• trunk/lib/Mungo.pm (modified) (2 diffs)
• trunk/lib/Mungo/Arbiter.pm (modified) (1 diff)
• trunk/lib/Mungo/Arbiter/Response.pm (modified) (1 diff)
• trunk/lib/Mungo/Response.pm (modified) (2 diffs)

trunk/lib/Mungo.pm

@@ -68 +68 @@
-  return $s;
-}
-
-sub URLDecode {
-  my $self = shift;
@@ -208 +207 @@
-  };
-  if($@) {
+    # print out the error to the logs
+    print STDERR $@ if($@);
-    # If it isn't too late, make this an internal server error
-    eval { $self->Response()->{Status} = 500; };
-    # print out the error to the logs
-    print STDERR $@ if($@);
-  }
- MUNGO_HANDLER_FINISH:

trunk/lib/Mungo/Arbiter.pm

@@ -9 +9 @@
-  die "Mungo '$key' is immutable!\n";
-  return 0;
+}
+sub __boolean {
+  my ($self, $key, $value) = @_;
+  return 1 if ($value =~ /^(?:0|1)$/);
+  return 0;
+}
+sub __coderef {
+  my ($self, $key, $value) = @_;
+  return (ref $value eq 'CODE') ? 1 : 0;
-}
-sub TIEHASH {

trunk/lib/Mungo/Arbiter/Response.pm

@@ -76 +76 @@
-  'Method' => \&Mungo::Arbiter::__immutable,
-  'TotalBytes' => \&__immutable,
+  'OnError' => \&Mungo::Arbiter::__coderef,
-);
-

trunk/lib/Mungo/Response.pm

@@ -130 +130 @@
-  };
-  if($@) {
-    use Data::Dumper;
-    print "Error in Include($subject):<br />\n";
-    my $href = $@;
-    eval {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-      }
-
-
-
-
-
-
-
+
+
-      }
-    };
@@ -165 +147 @@
-  return $rv;
-}
+
+sub defaultErrorHandler {
+  use Data::Dumper;
+  my $self = shift;
+  my $href = shift; # Our Error
+  my $subject = shift;
+  print "Error in Include($subject):<br />\n";
+  my $pkg = $href->{callstack}->[0]->[0];
+  my $preamble = eval "\$${pkg}::Mungo_preamble;";
+  my $postamble = eval "\$${pkg}::Mungo_postamble;";
+  my $contents = eval "\$${pkg}::Mungo_contents;";
+  print "<pre class=\"error\">$href->{error}</pre><br />\n";
+
+  unless($contents) {
+    my $filename = $href->{callstack}->[0]->[1];
+    if(open(FILE, "<$filename")) {
+      local $/ = undef;
+      $$contents = <FILE>;
+      close(FILE);
+    }
+  }
+
+  if($contents) {
+    if($self->{'Apache::Request'}->dir_config('Debug')) {
+      print Mungo::Utils::pretty_print_code($preamble, $contents, $postamble, $href->{callstack}->[0]->[2]);
+    }
+  } else {
+    print '<pre>'.Dumper($@).'</pre>';
+  }
+}
+
-sub TrapInclude {
-  my $self = shift;