Skip to content

Commit 3ef7123

Browse files
perlDreamerperlDreamer
committedJan 5, 2012
Modperl => Starman changes.
1 parent 6d49e1d commit 3ef7123

File tree

5 files changed

+45
-65
lines changed

5 files changed

+45
-65
lines changed
 

‎wre/lib/WRE/Starman.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ sub killRunaways {
7070

7171
=head2 ping ( )
7272
73-
Returns a 1 if Modperl is running, or a 0 if it is not.
73+
Returns a 1 if Starman is running, or a 0 if it is not.
7474
7575
=cut
7676

‎wre/sbin/backup.pl

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ sub backupMysql {
4646

4747
# disable wremonitor to prevent false positives
4848
$config->set("wreMonitor/nginxAdministrativelyDown", 1);
49-
$config->set("wreMonitor/modperlAdministrativelyDown", 1);
49+
$config->set("wreMonitor/starmanAdministrativelyDown", 1);
5050

5151

5252
my $mysql = WRE::Mysql->new(wreConfig=>$config);
@@ -74,7 +74,7 @@ sub backupMysql {
7474
$db->disconnect;
7575

7676
# re-enable WRE monitor
77-
$config->set("wreMonitor/modperlAdministrativelyDown", 0);
77+
$config->set("wreMonitor/starmanAdministrativelyDown", 0);
7878
$config->set("wreMonitor/nginxAdministrativelyDown", 0);
7979
}
8080

‎wre/sbin/wreconsole.pl

+25-45
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
use WRE::Config;
2626
use WRE::File;
2727
use WRE::Host;
28-
use WRE::Modperl;
28+
use WRE::Starman;
2929
use WRE::Nginx;
3030
use WRE::Mysql;
3131
use WRE::Site;
@@ -182,7 +182,7 @@ sub www_addSite {
182182
$content .= '
183183
<h1>Add A Site</h1>
184184
<div class="status">'.$status.'</div>
185-
<p>Adding a site requires you to restart modperl, nginx, and Spectre.</p>
185+
<p>Adding a site requires you to restart starman, nginx, and Spectre.</p>
186186
<form action="/addSiteSave" method="post">
187187
<table>
188188
<tr>
@@ -273,7 +273,7 @@ sub www_deleteSite {
273273
<div class="status">'.$status.'</div>
274274
<p>Are you sure you wish to delete this site and all it\'s content and users? This cannot be undone, once you
275275
click on the button below.</p>
276-
<p>Deleting a site requires you to restart modperl, nginx, and Spectre.</p>
276+
<p>Deleting a site requires you to restart starman, nginx, and Spectre.</p>
277277
<form action="/deleteSiteSave" method="post">
278278
<input type="hidden" name="filename" value="'.$cgi->param("filename").'" />
279279
<table>
@@ -386,9 +386,9 @@ sub www_editSettings {
386386
<input type="radio" name="wreMonNginx" value="1" '.(($wreMonitor->{items}{nginx} == 1) ? 'checked="1"' : '').' />Yes
387387
<input type="radio" name="wreMonNginx" value="0" '.(($wreMonitor->{items}{nginx} != 1) ? 'checked="1"' : '').' />No
388388
- nginx<br />
389-
<input type="radio" name="wreMonModperl" value="1" '.(($wreMonitor->{items}{modperl} == 1) ? 'checked="1"' : '').' />Yes
390-
<input type="radio" name="wreMonModperl" value="0" '.(($wreMonitor->{items}{modperl} != 1) ? 'checked="1"' : '').' />No
391-
- modperl<br />
389+
<input type="radio" name="wreMonSstarman" value="1" '.(($wreMonitor->{items}{starman} == 1) ? 'checked="1"' : '').' />Yes
390+
<input type="radio" name="wreMonSstarman" value="0" '.(($wreMonitor->{items}{starman} != 1) ? 'checked="1"' : '').' />No
391+
- starman<br />
392392
<input type="radio" name="wreMonMysql" value="1" '.(($wreMonitor->{items}{mysql} == 1) ? 'checked="1"' : '').' />Yes
393393
<input type="radio" name="wreMonMysql" value="0" '.(($wreMonitor->{items}{mysql} != 1) ? 'checked="1"' : '').' />No
394394
- MySQL<br />
@@ -580,7 +580,7 @@ sub www_editSettingsSave {
580580
$notifyString =~ s/\s+//g;
581581
my @notify = split(",", $notifyString);
582582
$config->set("wreMonitor/notify", \@notify);
583-
$config->set("wreMonitor/items/modperl", $cgi->param("wreMonModperl"));
583+
$config->set("wreMonitor/items/starman", $cgi->param("wreMonStarman"));
584584
$config->set("wreMonitor/items/nginx", $cgi->param("wreMonNginx"));
585585
$config->set("wreMonitor/items/mysql", $cgi->param("wreMonMysql"));
586586
$config->set("wreMonitor/items/runaway", $cgi->param("wreMonRunaway"));
@@ -639,15 +639,12 @@ sub www_editSettingsSave {
639639
$file->makePath($config->getDomainRoot("/demo"));
640640
$file->copy($config->getRoot("/var/setupfiles/demo.nginx"), $config->getRoot("/etc/demo.nginx"),
641641
{ force => 1, templateVars=>{ sitename=>$config->get("demo/hostname") } });
642-
$file->copy($config->getRoot("/var/setupfiles/demo.modperl"), $config->getRoot("/etc/demo.modperl"),
643-
{ force => 1, templateVars=>{ sitename=>$config->get("demo/hostname") } });
644-
$status .= "Demo settings changed. You must restart nginx and modperl for these changes to take effect.<br />";
642+
$status .= "Demo settings changed. You must restart nginx and starman for these changes to take effect.<br />";
645643
}
646644
# have to disable demos
647645
elsif ($config->get("demo/enabled") == 1 && $cgi->param("enableDemo") == 0) {
648646
$file->delete($config->getRoot("/etc/demo.nginx"));
649-
$file->delete($config->getRoot("/etc/demo.modperl"));
650-
$status .= "Demo settings changed. You must restart nginx and modperl for these changes to take effect.<br />";
647+
$status .= "Demo settings changed. You must restart nginx and starman for these changes to take effect.<br />";
651648
}
652649
$config->set("demo/enabled", $cgi->param("enableDemo"));
653650
$config->set("demo/duration", $cgi->param("demoDuration"));
@@ -729,7 +726,7 @@ sub www_editSite {
729726
}
730727
makeHtmlFormSafe($contents);
731728
$content .= '
732-
<p>Making a modification of these files requires a restart of modperl and nginx afterwards, and sometimes also a restart
729+
<p>Making a modification of these files requires a restart of starman and nginx afterwards, and sometimes also a restart
733730
of Spectre after that.</p>
734731
<form action="/editSiteSave" method="post">
735732
<input type="submit" class="saveButton" value="Save" /> <br /><br />
@@ -750,18 +747,6 @@ sub www_editSite {
750747
<textarea name="nginx">'.$$contents.'</textarea><br />
751748
<input type="submit" class="saveButton" value="Save" /> <br /><br />
752749
';
753-
$$contents = '';
754-
eval { $contents = $file->slurp($state->{config}->getRoot("/etc/".$sitename.".modperl")) };
755-
if ($@) {
756-
carp "Couldn't open $sitename.modperl file for editing $@";
757-
$content .= '<div class="status">'.$@.'</div>';
758-
}
759-
makeHtmlFormSafe($contents);
760-
$content .= '
761-
<div><b>'.$sitename.'.modperl</b></div>
762-
<textarea name="modperl">'.$$contents.'</textarea><br />
763-
<input type="submit" class="saveButton" value="Save" /> <br /><br />
764-
';
765750
sendResponse($state, $content);
766751
}
767752

@@ -787,11 +772,6 @@ sub www_editSiteSave {
787772
$status = "Couldn't save $sitename.nginx. $@";
788773
carp $status;
789774
}
790-
eval { $file->spit($state->{config}->getRoot("/etc/".$sitename.".modperl"), $state->{cgi}->param("modperl")) };
791-
if ($@) {
792-
$status = "Couldn't save $sitename.modperl. $@";
793-
carp $status;
794-
}
795775
www_listSites($state, $status);
796776
}
797777

@@ -830,23 +810,23 @@ sub www_listServices {
830810
</td>
831811
</tr>
832812
<tr>
833-
<td>Apache Modperl</td>
813+
<td>Starman</td>
834814
<td>';
835-
my $modperl = WRE::Modperl->new(wreConfig=>$state->{config});
836-
if (eval{$modperl->ping}) {
815+
my $starman = WRE::Starman->new(wreConfig=>$state->{config});
816+
if (eval{$starman->ping}) {
837817
$content .= '
838-
<form action="/stopModperl" method="post">
818+
<form action="/stopStarman" method="post">
839819
<input type="submit" class="deleteButton" value="Stop" onclick="this.value=\'Stopping...\'" />
840820
</form>';
841821
}
842822
else {
843823
$content .= '
844-
<form action="/startModperl" method="post">
824+
<form action="/startStarman" method="post">
845825
<input type="submit" class="saveButton" value="Start" onclick="this.value=\'Starting...\'" />
846826
</form>';
847827
}
848828
$content .= '
849-
<form action="/restartModperl" method="post">
829+
<form action="/restartStarman" method="post">
850830
<input type="submit" value="Restart" onclick="this.value=\'Restarting...\'" />
851831
</form>
852832
</td>
@@ -974,10 +954,10 @@ sub www_listUtilities {
974954
#-------------------------------------------------------------------
975955
sub www_restartModperl {
976956
my $state = shift;
977-
my $service = WRE::Modperl->new(wreConfig=>$state->{config});
978-
my $status = "Modperl restarted.";
957+
my $service = WRE::Starman->new(wreConfig=>$state->{config});
958+
my $status = "Starman restarted.";
979959
unless ($service->restart) {
980-
$status = "Modperl did not restart successfully. ".$@;
960+
$status = "Starman did not restart successfully. ".$@;
981961
}
982962
www_listServices($state, $status);
983963
}
@@ -1345,10 +1325,10 @@ sub www_setup {
13451325
#-------------------------------------------------------------------
13461326
sub www_startModperl {
13471327
my $state = shift;
1348-
my $service = WRE::Modperl->new(wreConfig=>$state->{config});
1349-
my $status = "Modperl started.";
1328+
my $service = WRE::Starman->new(wreConfig=>$state->{config});
1329+
my $status = "Starman started.";
13501330
unless (eval {$service->start} ) {
1351-
$status = "Modperl did not start successfully. ".$@;
1331+
$status = "Starman did not start successfully. ".$@;
13521332
}
13531333
www_listServices($state, $status);
13541334
}
@@ -1418,10 +1398,10 @@ sub www_stopConsole {
14181398
#-------------------------------------------------------------------
14191399
sub www_stopModperl {
14201400
my $state = shift;
1421-
my $service = WRE::Modperl->new(wreConfig=>$state->{config});
1422-
my $status = "Modperl stopped.";
1401+
my $service = WRE::Starman->new(wreConfig=>$state->{config});
1402+
my $status = "Starman stopped.";
14231403
unless ($service->stop) {
1424-
$status = "Modperl did not stop successfully. ".$@;
1404+
$status = "Starman did not stop successfully. ".$@;
14251405
}
14261406
www_listServices($state, $status);
14271407
}

‎wre/sbin/wremonitor.pl

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use Net::SMTP;
2020
use WRE::Config;
2121
use WRE::File;
22-
use WRE::Modperl;
22+
use WRE::Starman;
2323
use WRE::Nginx;
2424
use WRE::Mysql;
2525
use WRE::Spectre;
@@ -38,12 +38,12 @@
3838
monitor($mysql);
3939
}
4040

41-
if ($config->get("wreMonitor/items/modperl") && !$config->get("wreMonitor/modperlAdministrativelyDown")) {
42-
my $modperl = WRE::Modperl->new(wreConfig=>$config);
43-
monitor($modperl);
41+
if ($config->get("wreMonitor/items/starman") && !$config->get("wreMonitor/starmanAdministrativelyDown")) {
42+
my $starman = WRE::Starman->new(wreConfig=>$config);
43+
monitor($starman);
4444
if ($config->get("wreMonitor/items/runaway")) {
45-
my $killed = $modperl->killRunaways;
46-
logEntry("Killed $killed ".$modperl->getName." processes that were using too much memory.");
45+
my $killed = $starman->killRunaways;
46+
logEntry("Killed $killed ".$starman->getName." processes that were using too much memory.");
4747
}
4848
}
4949

‎wre/sbin/wreservice.pl

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Getopt::Long;
1616
use WRE::Config;
1717
use WRE::Host;
18-
use WRE::Modperl;
18+
use WRE::Starman;
1919
use WRE::Nginx;
2020
use WRE::Mysql;
2121
use WRE::Spectre;
@@ -43,7 +43,7 @@
4343
4444
all A shortcut that represents all the services.
4545
46-
modperl The Apache mod_perl service which runs WebGUI.
46+
starman The starman service which runs WebGUI.
4747
4848
nginx The nginx service which provides performance and security
4949
services for WebGUI.
@@ -52,7 +52,7 @@
5252
5353
spectre WebGUI's workflow governor.
5454
55-
web A shortcut that represents both modperl and nginx.
55+
web A shortcut that represents both starman and nginx.
5656
5757
Actions:
5858
@@ -98,8 +98,8 @@
9898
if (grep /^nginx|modproxy|all|web$/, @stop) {
9999
printSuccess(sub{WRE::Nginx->new(wreConfig=>$config)->stop}, "Stop nginx");
100100
}
101-
if (grep /^modperl|all|web$/, @stop) {
102-
printSuccess(sub{WRE::Modperl->new(wreConfig=>$config)->stop}, "Stop mod_perl");
101+
if (grep /^starman|modperl|all|web$/, @stop) {
102+
printSuccess(sub{WRE::Starman->new(wreConfig=>$config)->stop}, "Stop starman");
103103
}
104104
if (grep /^mysql|all$/, @stop) {
105105
printSuccess(sub{WRE::Mysql->new(wreConfig=>$config)->stop}, "Stop MySQL");
@@ -110,8 +110,8 @@
110110
if (grep /^mysql|all$/, @start) {
111111
printSuccess(sub{WRE::Mysql->new(wreConfig=>$config)->start}, "Start MySQL");
112112
}
113-
if (grep /^modperl|all|web$/, @start) {
114-
printSuccess(sub{WRE::Modperl->new(wreConfig=>$config)->start}, "Start mod_perl");
113+
if (grep /^starman|modperl|all|web$/, @start) {
114+
printSuccess(sub{WRE::Starman->new(wreConfig=>$config)->start}, "Start starman");
115115
}
116116
if (grep /^nginx|modproxy|all|web$/, @start) {
117117
printSuccess(sub{WRE::Nginx->new(wreConfig=>$config)->start}, "Start nginx");
@@ -125,8 +125,8 @@
125125
if (grep /^mysql|all$/, @restart) {
126126
printSuccess(sub{WRE::Mysql->new(wreConfig=>$config)->restart}, "Restart MySQL");
127127
}
128-
if (grep /^modperl|all|web$/, @restart) {
129-
printSuccess(sub{WRE::Modperl->new(wreConfig=>$config)->restart}, "Restart mod_perl");
128+
if (grep /^starman|modperl|all|web$/, @restart) {
129+
printSuccess(sub{WRE::Starman->new(wreConfig=>$config)->restart}, "Restart starman");
130130
}
131131
if (grep /^nginx|modproxy|all|web$/, @restart) {
132132
printSuccess(sub{WRE::Nginx->new(wreConfig=>$config)->restart}, "Restart nginx");
@@ -140,8 +140,8 @@
140140
if (grep /^mysql|all$/, @status) {
141141
printSuccess(sub{WRE::Mysql->new(wreConfig=>$config)->ping}, "Ping MySQL");
142142
}
143-
if (grep /^modperl|all|web$/, @status) {
144-
printSuccess(sub{WRE::Modperl->new(wreConfig=>$config)->ping}, "Ping mod_perl");
143+
if (grep /^starman|modperl|all|web$/, @status) {
144+
printSuccess(sub{WRE::Starman->new(wreConfig=>$config)->ping}, "Ping starman");
145145
}
146146
if (grep /^nginx|modproxy|all|web$/, @status) {
147147
printSuccess(sub{WRE::Nginx->new(wreConfig=>$config)->ping}, "Ping nginx");

0 commit comments

Comments
 (0)
Please sign in to comment.