[Cpan-forum-commit] rev 359 - in trunk: . bin lib/CPAN lib/CPAN/Forum www/cgi
svn at pti.co.il
svn at pti.co.il
Fri May 16 14:43:16 EEST 2008
Author: semuelf
Date: 2008-05-16 14:43:16 +0300 (Fri, 16 May 2008)
New Revision: 359
Modified:
trunk/TODO
trunk/bin/cpanratings.pl
trunk/lib/CPAN/Forum.pm
trunk/lib/CPAN/Forum/Build.pm
trunk/lib/CPAN/Forum/Handler.pm
trunk/www/cgi/index.pl
Log:
Fixed a mistake (that I created) in the logger.
I think that now it should work in mod_perl
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2008-05-11 20:27:00 UTC (rev 358)
+++ trunk/TODO 2008-05-16 11:43:16 UTC (rev 359)
@@ -2,6 +2,7 @@
Tests * Tests * Tests
stop using Class::DBI, use plain SQL calls
+ shmuel: I don't see where we use Class::DBI
move database to PostgreSQL
Modified: trunk/bin/cpanratings.pl
===================================================================
--- trunk/bin/cpanratings.pl 2008-05-11 20:27:00 UTC (rev 358)
+++ trunk/bin/cpanratings.pl 2008-05-16 11:43:16 UTC (rev 359)
@@ -19,7 +19,7 @@
CPAN::Forum::DBI->myinit($dbfile);
-open my $fh, $file or die "Could not open '$file'\n";
+open my $fh, "<", $file or die "Could not open '$file'\n";
my $line = <$fh>;
chomp $line;
Modified: trunk/lib/CPAN/Forum/Build.pm
===================================================================
--- trunk/lib/CPAN/Forum/Build.pm 2008-05-11 20:27:00 UTC (rev 358)
+++ trunk/lib/CPAN/Forum/Build.pm 2008-05-16 11:43:16 UTC (rev 359)
@@ -22,7 +22,7 @@
system "rm -rf blib";
copy_tree(from => ".", dir => "blib");
- replace_sh_bang("$Bin/blib", glob "blib/bin/* blib/www/cgi/*";
+ replace_sh_bang("$Bin/blib", glob "blib/bin/* blib/www/cgi/*");
}
sub ACTION_install {
Modified: trunk/lib/CPAN/Forum/Handler.pm
===================================================================
--- trunk/lib/CPAN/Forum/Handler.pm 2008-05-11 20:27:00 UTC (rev 358)
+++ trunk/lib/CPAN/Forum/Handler.pm 2008-05-16 11:43:16 UTC (rev 359)
@@ -5,26 +5,32 @@
use Apache2::Const -compile => qw(OK);
use Apache2::RequestRec ();
-my $seen;
+#my $seen;
-sub handler {
- my $r = shift;
- $r->content_type('text/html');
+my $root;
+BEGIN { $root = "$ENV{DOCUMENT_ROOT}/.."; }
+use lib "$root/lib";
+use lib "/home/gabor/perl5lib/lib";
+use lib "/home/gabor/perl5lib/lib/i486-linux-gnu-thread-multi";
+use CPAN::Forum;
- my $root = "$ENV{DOCUMENT_ROOT}/..";
- local @INC = ("$root/lib", "/home/gabor/perl5lib/lib", "/home/gabor/perl5lib/lib/i486-linux-gnu-thread-multi", @INC);
- require CPAN::Forum;
+#local @INC = ("$root/lib", "/home/gabor/perl5lib/lib", "/home/gabor/perl5lib/lib/i486-linux-gnu-thread-multi", @INC);
#use Data::Dumper;
#warn Dumper \%ENV;
- my $app = CPAN::Forum->new(
- TMPL_PATH => "$ENV{CPANFORUM_ROOT}/templates",
- PARAMS => {
- ROOT => $ENV{CPANFORUM_ROOT},
- DB_CONNECT => "dbi:SQLite:$ENV{CPANFORUM_ROOT}/db/forum.db",
- #REQUEST => ($ENV{SCRIPT_NAME} || '') . ($ENV{PATH_INFO} || ''),
- },
- );
+my $app = CPAN::Forum->new(
+ TMPL_PATH => "$ENV{CPANFORUM_ROOT}/templates",
+ PARAMS => {
+ ROOT => $ENV{CPANFORUM_ROOT},
+ DB_CONNECT => "dbi:SQLite:$ENV{CPANFORUM_ROOT}/db/forum.db",
+ #REQUEST => ($ENV{SCRIPT_NAME} || '') . ($ENV{PATH_INFO} || ''),
+ },
+);
+
+sub handler {
+ my $r = shift;
+# $r->content_type('text/html');
+
$app->run();
return Apache2::Const::OK;
}
Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm 2008-05-11 20:27:00 UTC (rev 358)
+++ trunk/lib/CPAN/Forum.pm 2008-05-16 11:43:16 UTC (rev 359)
@@ -418,39 +418,8 @@
CPAN::Forum::DBI->myinit($db_connect);
my $dbh = CPAN::Forum::DBI::db_Main();
- my $log = $self->param("ROOT") . "/db/messages.log";
$STATUS_FILE = $self->param("ROOT") . "/db/status";
- my $log_level = $self->_set_log_level();
-
- $self->log_config(
- LOG_DISPATCH_MODULES => [
- {
- module => 'Log::Dispatch::File',
- name => 'messages',
- filename => $log,
- min_level => $log_level,
- mode => 'append',
- callbacks => sub { $self->_logger(@_)},
- close_after_write => 1,
- },
- ],
- APPEND_NEWLINE => 1,
- );
-
- $self->log->debug("--- START ---");
-
CGI::Session->name($cookiename);
- $self->session_config(
- #CGI_SESSION_OPTIONS => [ "driver:File", $self->query, {Directory => "/tmp"}],
- #CGI_SESSION_OPTIONS => [ "driver:SQLite", $self->query, {Handle => $dbh}],
- COOKIE_PARAMS => {
- -expires => '+14d',
- -path => '/',
- },
- SEND_COOKIE => 0,
-
- );
-
}
# overriding the run method, to momentarily install warnings handler
@@ -458,16 +427,9 @@
our $logger;
sub run {
my ($self) = @_;
- local $logger = sub { $self->log->warning($_[0]) };
- local $SIG{__WARN__} = $logger;
+ local $logger = $self->log;
+ local $SIG{__WARN__} = sub { $self->log->warning($_[0]) };
$self->SUPER::run();
- #$SIG{__WARN__} = sub {
- # if ($logger) {
- # $logger->warning($_[0]);
- # } else {
- # print STDERR $_[0];
- # }
- #};
}
sub _logger {
@@ -586,6 +548,38 @@
sub setup {
my $self = shift;
+
+ my $log = $self->param("ROOT") . "/db/messages.log";
+ my $log_level = $self->_set_log_level();
+
+ $self->log_config(
+ LOG_DISPATCH_MODULES => [
+ {
+ module => 'Log::Dispatch::File',
+ name => 'messages',
+ filename => $log,
+ min_level => $log_level,
+ mode => 'append',
+ callbacks => sub { $self->_logger(@_)},
+ close_after_write => 1,
+ },
+ ],
+ APPEND_NEWLINE => 1,
+ );
+
+ $self->log->debug("--- START ---");
+
+ $self->session_config(
+ #CGI_SESSION_OPTIONS => [ "driver:File", $self->query, {Directory => "/tmp"}],
+ #CGI_SESSION_OPTIONS => [ "driver:SQLite", $self->query, {Handle => $dbh}],
+ COOKIE_PARAMS => {
+ -expires => '+14d',
+ -path => '/',
+ },
+ SEND_COOKIE => 0,
+
+ );
+
$self->start_mode("home");
$self->run_modes([@free_modes, @restricted_modes]);
$self->run_modes(AUTOLOAD => "autoload");
@@ -604,6 +598,7 @@
$self->header_props(
-charset => "utf-8",
+ -type => 'text/html',
);
my $status = $self->status();
Modified: trunk/www/cgi/index.pl
===================================================================
--- trunk/www/cgi/index.pl 2008-05-11 20:27:00 UTC (rev 358)
+++ trunk/www/cgi/index.pl 2008-05-16 11:43:16 UTC (rev 359)
@@ -13,7 +13,7 @@
PARAMS => {
ROOT => $ENV{CPANFORUM_ROOT},
DB_CONNECT => "dbi:SQLite:$ENV{CPANFORUM_ROOT}/db/forum.db",
- REQUEST => $ENV{PATH_INFO},
+ #REQUEST => $ENV{PATH_INFO},
},
);
$app->run();
More information about the Cpan-forum-commit
mailing list