[Jifty-commit] r478 - wifty/trunk/lib/Wifty wifty/trunk/web/templates

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Fri Jan 6 17:49:26 EST 2006


Author: jesse
Date: Fri Jan  6 17:49:25 2006
New Revision: 478

Added:
   wifty/trunk/etc/log4perl.conf
Modified:
   /   (props changed)
   wifty/trunk/etc/config.yml
   wifty/trunk/lib/Wifty/Dispatcher.pm
   wifty/trunk/web/templates/autohandler

Log:
 r22200 at truegrounds:  jesse | 2006-01-06 23:47:36 +0100
 * sync wifty to the dispatcher


Modified: wifty/trunk/etc/config.yml
==============================================================================
--- wifty/trunk/etc/config.yml	(original)
+++ wifty/trunk/etc/config.yml	Fri Jan  6 17:49:25 2006
@@ -1,6 +1,8 @@
 framework:
   AdminMode: 0
   ApplicationName: Wifty
+  LogConfig: etc/log4perl.conf
+
   Web:
     Port: 80
     BaseURL: http://jifty.org

Added: wifty/trunk/etc/log4perl.conf
==============================================================================
--- (empty file)
+++ wifty/trunk/etc/log4perl.conf	Fri Jan  6 17:49:25 2006
@@ -0,0 +1,34 @@
+log4perl.rootLogger=DEBUG, ShowInfo, LogToFile, ErrorsToFile
+
+# Disable debugging output for certain modules; comment these lines to have them
+# show up again
+
+log4perl.logger.Jifty::MasonInterp = INFO, ShowInfo, LogToFile
+
+# If you want to make DEBUG level for Jifty::Some::Module show up on the screen
+# (and not just the log file), add the
+# following line:
+#log4perl.logger.Jifty::Some::Module=DEBUG, ShowCategoryDebug
+
+log4perl.appender.ShowInfo=Log::Log4perl::Appender::ScreenColoredLevels
+log4perl.appender.ShowInfo.layout=Log::Log4perl::Layout::PatternLayout
+log4perl.appender.ShowInfo.layout.ConversionPattern=%d %p> %F{1}:%L %M - %m%n
+#log4perl.appender.ShowInfo.Threshold=INFO
+
+log4perl.appender.LogToFile=Log::Log4perl::Appender::File
+log4perl.appender.LogToFile.filename= sub { Jifty::Util->absolute_path("log/server.log") }
+log4perl.appender.LogToFile.mode=append
+log4perl.appender.LogToFile.layout=Log::Log4perl::Layout::PatternLayout
+log4perl.appender.LogToFile.layout.ConversionPattern=%d %p> %F{1}:%L %M - %m%n
+
+log4perl.appender.ErrorsToFile=Log::Log4perl::Appender::File
+log4perl.appender.ErrorsToFile.filename= sub { Jifty::Util->absolute_path("log/error.log") }
+log4perl.appender.ErrorsToFile.mode=append
+log4perl.appender.ErrorsToFile.layout=Log::Log4perl::Layout::PatternLayout
+log4perl.appender.ErrorsToFile.layout.ConversionPattern=%d %p> %F{1}:%L %M - %m%n
+log4perl.appender.ErrorsToFile.Threshold=WARN
+
+log4perl.appender.ShowCategoryDebug=Log::Log4perl::Appender::ScreenColoredLevels
+log4perl.appender.ShowCategoryDebug.layout=Log::Log4perl::Layout::PatternLayout
+log4perl.appender.ShowCategoryDebug.layout.ConversionPattern=%d %p> %F{1}:%L %M - %m%n
+

Modified: wifty/trunk/lib/Wifty/Dispatcher.pm
==============================================================================
--- wifty/trunk/lib/Wifty/Dispatcher.pm	(original)
+++ wifty/trunk/lib/Wifty/Dispatcher.pm	Fri Jan  6 17:49:25 2006
@@ -3,14 +3,16 @@
 
 on '/', redirect( '/view/HomePage');
 
-under '/create/*', run {
+on '/create/*', run {
      set page => $1;
      set action => Jifty->web->new_action( class => 'CreatePage' );
+     show("/create");
 };
 
 
 on qr{(view|edit)/(.*)}, run {
     my ( $name, $rev );
+    my $page_name = $1;
     if ( $2 =~ qr{^(.*?)/?(\d*?)$} ) {
         $name = $1;
         $rev  = $2;
@@ -23,7 +25,7 @@
     set page => $page;
     set revision => $revision;
     set viewer => Jifty->web->new_action( class => 'UpdatePage', record => $page );
-    show("/view");
+    show("/$page_name");
 };
 
 on 'history/*', run {
@@ -37,7 +39,7 @@
 
     set page => $page;
     set revisions => $revisions;
-
+    show('/history');
 };
 
 
@@ -79,7 +81,7 @@
 
 };
 
-on 'logout', run {
+before 'logout', run {
     Jifty->web->request->add_action(
         moniker => 'logout',
         class   => 'Wifty::Action::Logout'

Modified: wifty/trunk/web/templates/autohandler
==============================================================================
--- wifty/trunk/web/templates/autohandler	(original)
+++ wifty/trunk/web/templates/autohandler	Fri Jan  6 17:49:25 2006
@@ -1,6 +1,6 @@
 <%init>
 $r->content_type('text/html; charset=utf-8');
-Jifty->web->handle_request();
+#Jifty->web->handle_request();
 
 if ($m->base_comp->path =~ m|/_elements/|) {
     # Requesting an internal component by hand -- naughty
@@ -17,6 +17,7 @@
 </%init>
 <%def .setup_actions>
 <%init>
+# XXX TODO: move all this into the dispatcher
 Jifty->web->allow_actions(qr/.*/);
 # this method turns around and calls the setup_actions method 
 # it's called by Jifty::Web->setup_page_actions.


More information about the Jifty-commit mailing list