Skip to content

Commit 5f4099a

Browse files
committedFeb 9, 2012
democleanup needs to restart starman after cleaning config files.
1 parent 734098b commit 5f4099a

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed
 

‎wre/sbin/democleanup.pl

+27-18
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
use WRE::Config;
1717
use WRE::File;
1818
use WRE::Mysql;
19+
use WRE::Starman;
20+
use 5.010.;
1921

2022
my ($all, $help, $verbose);
2123
$|=1;
@@ -27,7 +29,7 @@
2729
);
2830

2931
if ($help) {
30-
print <<STOP;
32+
say <<STOP;
3133
3234
Usage: $0
3335
@@ -42,34 +44,34 @@
4244
STOP
4345
}
4446

45-
print "START UP.\n" if ($verbose);
46-
print "Reading demo config.\n" if ($verbose);
47+
say "START UP." if ($verbose);
48+
say "Reading demo config." if ($verbose);
4749
my $config = WRE::Config->new;
4850
my $file = WRE::File->new(wreConfig=>$config);
49-
print "Getting the list of demo sites.\n" if ($verbose);
51+
say "Getting the list of demo sites." if ($verbose);
5052
opendir(my $demodir, $config->getWebguiRoot("/etc"));
5153
my @demos = ();
5254
foreach my $file (readdir($demodir)) {
5355
next unless $file =~ m/^demo/;
5456
my $config = eval {Config::JSON->new($config->getWebguiRoot("/etc/".$file)) };
5557
if ($@) {
56-
print "Error reading $file\n" if ($verbose);
58+
say "Error reading $file" if ($verbose);
5759
}
5860
else {
5961
push @demos, $config;
6062
}
6163
}
6264
closedir($demodir);
6365

64-
print "Deleting demos.\n" if ($verbose);
66+
say "Deleting demos." if ($verbose);
6567
foreach my $demo (@demos) {
6668
my $demoId = $demo->getFilename;
6769
$demoId =~ s/(demo.*)\.conf/$1/;
6870
if ($all || time() - $demo->get("demoCreated") > $config->get("demo/duration") * 60 * 60 * 24) {
69-
print "Deleting Site: ".$demoId."\n" if ($verbose);
71+
say "Deleting Site: ".$demoId."" if ($verbose);
7072

7173
# database
72-
print "\tConnecting to database.\n" if ($verbose);
74+
say "\tConnecting to database." if ($verbose);
7375
my $databaseName = $demo->get("dsn");
7476
$databaseName =~ s/^DBI\:mysql\:(\w+).*$/$1/i;
7577
my $databaseUser = $demo->get("dbuser");
@@ -79,31 +81,38 @@
7981
username=>$config->get("demo/user")
8082
)};
8183
if ($@) {
82-
print "\tCan't connect to database, so can't delete site.\n" if ($verbose);
84+
say "\tCan't connect to database, so can't delete site." if ($verbose);
8385
}
8486
else {
85-
print "\tDropping database.\n" if ($verbose);
87+
say "\tDropping database." if ($verbose);
8688
eval{$db->do("drop database $databaseName")};
87-
print "\tError: $@\n" if ($@ && $verbose);
88-
print "\tRevoking database privileges.\n" if ($verbose);
89+
say "\tError: $@" if ($@ && $verbose);
90+
say "\tRevoking database privileges." if ($verbose);
8991
eval{$db->do("revoke all privileges on ".$databaseName.".* from '".$databaseUser."'\@'%'")};
90-
print "\tError: $@\n" if ($@ && $verbose);
92+
say "\tError: $@" if ($@ && $verbose);
9193
$db->disconnect;
9294

9395
# web root
94-
print "\tDeleting Web Root.\n" if ($verbose);
96+
say "\tDeleting Web Root." if ($verbose);
9597
$file->delete($config->getDomainRoot("/demo/".$demoId));
9698

9799
# webgui
98-
print "\tDeleting WebGUI Config.\n" if ($verbose);
100+
say "\tDeleting WebGUI Config." if ($verbose);
99101
$file->delete($demo->getFilePath);
100102

101-
print "\tFinished deleting $demoId\n" if ($verbose);
103+
say "\tFinished deleting $demoId" if ($verbose);
102104
}
103105
}
104106
else {
105-
print "Skipping Site: ".$demoId."\n" if ($verbose);
107+
say "Skipping Site: ".$demoId if ($verbose);
106108
}
107109
}
108-
print "COMPLETE.\n" if ($verbose);
110+
say "Restarting Starman" if $verbose;
111+
if (eval { WRE::Starman->new(wreConfig=>$config)->restart; }) {
112+
say "OK" if $verbose;
113+
}
114+
else {
115+
say "Failed: $@";
116+
}
117+
say "COMPLETE." if ($verbose);
109118

0 commit comments

Comments
 (0)
Please sign in to comment.