[Rt-commit] rt branch, psgi, updated. rt-3.9.4-188-g33e165a
Chia-liang Kao
clkao at bestpractical.com
Tue Oct 19 08:32:04 EDT 2010
The branch, psgi has been updated
via 33e165aaef5f24e3e93f2665f7289cafa785f827 (commit)
via 7477a97920a3857fc92676e0132b95e2ff6a6853 (commit)
from 3fa13eef1eed8b2edc214c5d58e91a90ee5b6676 (commit)
Summary of changes:
bin/standalone_httpd.in | 203 ----------------------------------------------
configure.ac | 2 +-
sbin/rt-server.in | 91 ++++++++++++++-------
sbin/standalone_httpd.in | 1 +
4 files changed, 64 insertions(+), 233 deletions(-)
delete mode 100755 bin/standalone_httpd.in
mode change 100644 => 100755 sbin/rt-server.in
create mode 120000 sbin/standalone_httpd.in
- Log -----------------------------------------------------------------
commit 7477a97920a3857fc92676e0132b95e2ff6a6853
Author: Chia-liang Kao <clkao at bestpractical.com>
Date: Tue Oct 19 21:17:30 2010 +0900
psgify standalon_httpd
diff --git a/bin/standalone_httpd.in b/bin/standalone_httpd.in
index ed33b44..6b26815 100755
--- a/bin/standalone_httpd.in
+++ b/bin/standalone_httpd.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/Users/clkao/bin/perl -w
# BEGIN BPS TAGGED BLOCK {{{
#
# COPYRIGHT:
@@ -52,7 +52,7 @@ use strict;
# fix lib paths, some may be relative
BEGIN {
require File::Spec;
- my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
+ my @libs = ("./lib", "./local/lib");
my $bin_path;
for my $lib (@libs) {
@@ -75,11 +75,9 @@ BEGIN {
}
use Getopt::Long;
-my %opt;
-GetOptions(\%opt, 'help|h');
-
no warnings 'once';
-if ( $opt{help} ) {
+
+if (grep { m/help/ } @ARGV) {
require Pod::Usage;
print Pod::Usage::pod2usage( { verbose => 2 } );
exit;
@@ -88,10 +86,10 @@ if ( $opt{help} ) {
require RT;
RT->LoadConfig();
-my $explicit_port = shift @ARGV;
+my $explicit_port = $ARGV[0] && $ARGV[0] !~ m/-/ ? shift @ARGV : undef;
+warn "Deprecated: please run $0 --port $explicit_port instead".$/ if $explicit_port;
my $port = $explicit_port || RT->Config->Get('WebPort') || '8080';
-
require RT::Handle;
my ($integrity, $state, $msg) = RT::Handle->CheckIntegrity;
@@ -134,24 +132,24 @@ EOF
}
}
-require RT::Interface::Web::Standalone;
-my $server = RT::Interface::Web::Standalone->new;
-run_server($port);
-exit 0;
+require RT::Interface::Web::Handler;
+use Plack::Runner;
+my $r = Plack::Runner->new( server => 'Standalone', env => 'deployment' );
-sub run_server {
- my $port = shift;
- $server->port($port);
- eval { $server->run() };
+my @args = @ARGV;
+push @args, '--port', $port unless grep { m/port/ } @args;
- if ( my $err = $@ ) {
- handle_startup_error($err);
- }
+$r->parse_options(@args);
+eval { $r->run(RT::Interface::Web::Handler->PSGIApp) };
+if (my $err = $@) {
+ handle_startup_error($err);
}
+exit 0;
+
sub handle_startup_error {
my $err = shift;
- if ( $err =~ /bind: Permission denied/ ) {
+ if ( $err =~ /listen.*Permission denied/ ) {
handle_bind_error();
} else {
die
@@ -172,17 +170,6 @@ EOF
if ($explicit_port) {
print STDERR
"Please check your system configuration or choose another port\n\n";
- } else {
- print STDERR "\nFor now, RT has chosen an alternate port to run on.\n\n";
- if ( !$integrity ) {
- print STDERR <<EOF;
-You can use this server to configure and explore RT. While configuring
-RT, you'll have a chance to set a permanent port and URL for your
-server.
-
-EOF
- }
- run_server( 8000 + int( rand(1024) ) );
}
}
@@ -195,7 +182,7 @@ standalone_httpd - RT standalone server
=head1 SYNOPSIS
# runs server listening on port 8080
- standalone_httpd 8080
+ standalone_httpd --port 8080
=head1 DESCRIPTION
commit 33e165aaef5f24e3e93f2665f7289cafa785f827
Author: Chia-liang Kao <clkao at bestpractical.com>
Date: Tue Oct 19 21:29:16 2010 +0900
combine standalone_httpd and rt-server
diff --git a/bin/standalone_httpd.in b/bin/standalone_httpd.in
deleted file mode 100755
index 6b26815..0000000
--- a/bin/standalone_httpd.in
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/Users/clkao/bin/perl -w
-# BEGIN BPS TAGGED BLOCK {{{
-#
-# COPYRIGHT:
-#
-# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
-# <jesse at bestpractical.com>
-#
-# (Except where explicitly superseded by other copyright notices)
-#
-#
-# LICENSE:
-#
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-#
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-#
-#
-# CONTRIBUTION SUBMISSION POLICY:
-#
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-#
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-#
-# END BPS TAGGED BLOCK }}}
-use warnings;
-use strict;
-
-# fix lib paths, some may be relative
-BEGIN {
- require File::Spec;
- my @libs = ("./lib", "./local/lib");
- my $bin_path;
-
- for my $lib (@libs) {
- unless ( File::Spec->file_name_is_absolute($lib) ) {
- unless ($bin_path) {
- if ( File::Spec->file_name_is_absolute(__FILE__) ) {
- $bin_path = ( File::Spec->splitpath(__FILE__) )[1];
- }
- else {
- require FindBin;
- no warnings "once";
- $bin_path = $FindBin::Bin;
- }
- }
- $lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
- }
- unshift @INC, $lib;
- }
-
-}
-
-use Getopt::Long;
-no warnings 'once';
-
-if (grep { m/help/ } @ARGV) {
- require Pod::Usage;
- print Pod::Usage::pod2usage( { verbose => 2 } );
- exit;
-}
-
-require RT;
-RT->LoadConfig();
-
-my $explicit_port = $ARGV[0] && $ARGV[0] !~ m/-/ ? shift @ARGV : undef;
-warn "Deprecated: please run $0 --port $explicit_port instead".$/ if $explicit_port;
-my $port = $explicit_port || RT->Config->Get('WebPort') || '8080';
-
-require RT::Handle;
-my ($integrity, $state, $msg) = RT::Handle->CheckIntegrity;
-
-unless ( $integrity ) {
- print STDERR <<EOF;
-
-RT couldn't connect to the database where tickets are stored.
-If this is a new installation of RT, you should visit the URL below
-to configure RT and initialize your database.
-
-If this is an existing RT installation, this may indicate a database
-connectivity problem.
-
-The error RT got back when trying to connect to your database was:
-
-$msg
-
-EOF
-
- require RT::Installer;
- # don't enter install mode if the file exists but is unwritable
- if (-e RT::Installer->ConfigFile && !-w _) {
- die 'Since your configuration exists ('
- . RT::Installer->ConfigFile
- . ") but is not writable, I'm refusing to do anything.\n";
- }
-
- RT->Config->Set( 'LexiconLanguages' => '*' );
- RT::I18N->Init;
-
- RT->InstallMode(1);
-} else {
- RT->Init();
- if (RT->Config->Get('DevelMode')) { require Module::Refresh; }
-
- my ($status, $msg) = RT::Handle->CheckCompatibility( $RT::Handle->dbh, 'post');
- unless ( $status ) {
- print STDERR $msg, "\n\n";
- exit -1;
- }
-}
-
-require RT::Interface::Web::Handler;
-use Plack::Runner;
-my $r = Plack::Runner->new( server => 'Standalone', env => 'deployment' );
-
-my @args = @ARGV;
-push @args, '--port', $port unless grep { m/port/ } @args;
-
-$r->parse_options(@args);
-eval { $r->run(RT::Interface::Web::Handler->PSGIApp) };
-if (my $err = $@) {
- handle_startup_error($err);
-}
-
-exit 0;
-
-sub handle_startup_error {
- my $err = shift;
- if ( $err =~ /listen.*Permission denied/ ) {
- handle_bind_error();
- } else {
- die
- "Something went wrong while trying to run RT's standalone web server:\n\t"
- . $err;
- }
-}
-
-
-sub handle_bind_error {
-
- print STDERR <<EOF;
-WARNING: RT couldn't start up a web server on port @{[$port]}.
-This is often the case if you're running @{[$0]} as
-someone other than your system's "root" user.
-EOF
-
- if ($explicit_port) {
- print STDERR
- "Please check your system configuration or choose another port\n\n";
- }
-}
-
-__END__
-
-=head1 NAME
-
-standalone_httpd - RT standalone server
-
-=head1 SYNOPSIS
-
- # runs server listening on port 8080
- standalone_httpd --port 8080
-
-=head1 DESCRIPTION
-
-This script runs an RT server using C<RT::Interface::Web::Standalone>
-
diff --git a/configure.ac b/configure.ac
index 3981d16..b5bb8af 100755
--- a/configure.ac
+++ b/configure.ac
@@ -408,10 +408,10 @@ AC_CONFIG_FILES([
sbin/rt-validator
sbin/rt-email-group-admin
sbin/rt-server
+ sbin/standalone_httpd
bin/fastcgi_server
bin/mason_handler.fcgi
bin/mason_handler.scgi
- bin/standalone_httpd
bin/rt-crontool
bin/rt-mailgate
bin/rt],
diff --git a/sbin/rt-server.in b/sbin/rt-server.in
old mode 100644
new mode 100755
index f5446f6..87510cf
--- a/sbin/rt-server.in
+++ b/sbin/rt-server.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/Users/clkao/bin/perl -w
# BEGIN BPS TAGGED BLOCK {{{
#
# COPYRIGHT:
@@ -52,7 +52,7 @@ use strict;
# fix lib paths, some may be relative
BEGIN {
require File::Spec;
- my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
+ my @libs = ("./lib", "./local/lib");
my $bin_path;
for my $lib (@libs) {
@@ -75,28 +75,20 @@ BEGIN {
}
use Getopt::Long;
+no warnings 'once';
-my %opt;
-GetOptions(\%opt, 'help|h');
-
-if ( $opt{help} ) {
+if (grep { m/help/ } @ARGV) {
require Pod::Usage;
- Pod::Usage::pod2usage( { verbose => 2 } );
+ print Pod::Usage::pod2usage( { verbose => 2 } );
exit;
}
-my $port = shift @ARGV || RT->Config->Get('WebPort') || '8080';
-
-
require RT;
RT->LoadConfig();
-RT->InitLogging();
-if (RT->Config->Get('DevelMode')) { require Module::Refresh; }
-
-RT::CheckPerlRequirements();
-RT->InitPluginPaths();
-
+my $explicit_port = $ARGV[0] && $ARGV[0] !~ m/-/ ? shift @ARGV : undef;
+warn "Deprecated: please run $0 --port $explicit_port instead".$/ if $explicit_port;
+my $port = $explicit_port || RT->Config->Get('WebPort') || '8080';
require RT::Handle;
my ($integrity, $state, $msg) = RT::Handle->CheckIntegrity;
@@ -120,7 +112,9 @@ EOF
require RT::Installer;
# don't enter install mode if the file exists but is unwritable
if (-e RT::Installer->ConfigFile && !-w _) {
- die "Since your configuration exists but is not writable, I'm refusing to do anything.\n";
+ die 'Since your configuration exists ('
+ . RT::Installer->ConfigFile
+ . ") but is not writable, I'm refusing to do anything.\n";
}
RT->Config->Set( 'LexiconLanguages' => '*' );
@@ -128,30 +122,69 @@ EOF
RT->InstallMode(1);
} else {
- RT->ConnectToDatabase();
- RT->InitSystemObjects();
- RT->InitClasses();
- RT->InitPlugins();
+ RT->Init();
+ if (RT->Config->Get('DevelMode')) { require Module::Refresh; }
+
+ my ($status, $msg) = RT::Handle->CheckCompatibility( $RT::Handle->dbh, 'post');
+ unless ( $status ) {
+ print STDERR $msg, "\n\n";
+ exit -1;
+ }
+}
+
+require RT::Interface::Web::Handler;
+use Plack::Runner;
+my $r = Plack::Runner->new( server => $0 =~ 'rt-server$' ? 'Starlet' : 'Standalone', env => 'deployment' );
+
+my @args = @ARGV;
+push @args, '--port', $port unless grep { m/port/ } @args;
+
+$r->parse_options(@args);
+eval { $r->run(RT::Interface::Web::Handler->PSGIApp) };
+if (my $err = $@) {
+ handle_startup_error($err);
}
-require RT::Interface::Web::Standalone;
-my $server = RT::Interface::Web::Standalone->new;
-$server->net_server('RT::Interface::Web::Standalone::PreFork');
-$server->port($port);
-$server->run();
+exit 0;
+
+sub handle_startup_error {
+ my $err = shift;
+ if ( $err =~ /listen.*Permission denied/ ) {
+ handle_bind_error();
+ } else {
+ die
+ "Something went wrong while trying to run RT's standalone web server:\n\t"
+ . $err;
+ }
+}
+
+
+sub handle_bind_error {
+
+ print STDERR <<EOF;
+WARNING: RT couldn't start up a web server on port @{[$port]}.
+This is often the case if you're running @{[$0]} as
+someone other than your system's "root" user.
+EOF
+
+ if ($explicit_port) {
+ print STDERR
+ "Please check your system configuration or choose another port\n\n";
+ }
+}
__END__
=head1 NAME
-rt-server - RT standalone server with prefork
+standalone_httpd - RT standalone server
=head1 SYNOPSIS
# runs server listening on port 8080
- rt-server 8080
+ standalone_httpd --port 8080
=head1 DESCRIPTION
-This script runs an RT server using C<RT::Interface::Web::Standalone::PreFork>
+This script runs an RT server using C<RT::Interface::Web::Standalone>
diff --git a/sbin/standalone_httpd.in b/sbin/standalone_httpd.in
new file mode 120000
index 0000000..0488cd9
--- /dev/null
+++ b/sbin/standalone_httpd.in
@@ -0,0 +1 @@
+rt-server.in
\ No newline at end of file
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list