From 8b67964099cc55cde94f2789eec31f6732642863 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sun, 25 Sep 2011 10:44:36 -0500 Subject: [PATCH 1/2] preparing for release --- lib/Lacuna.pm | 2 +- var/www/public/changes.txt | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/Lacuna.pm b/lib/Lacuna.pm index db7d05d1..2de4b45d 100644 --- a/lib/Lacuna.pm +++ b/lib/Lacuna.pm @@ -7,7 +7,7 @@ use Config::JSON; useall __PACKAGE__; -our $VERSION = 3.0813; +our $VERSION = 3.0814; my $config = Config::JSON->new('/data/Lacuna-Server/etc/lacuna.conf'); my $db = Lacuna::DB->connect($config->get('db/dsn'),$config->get('db/username'),$config->get('db/password'), { mysql_enable_utf8 => 1}); diff --git a/var/www/public/changes.txt b/var/www/public/changes.txt index 4bb91460..6387f471 100644 --- a/var/www/public/changes.txt +++ b/var/www/public/changes.txt @@ -1,3 +1,14 @@ +3.0814 + - Fix: creating a munitions lab does not break isolation status + - Fix: Gratch's Gauntlet cannot upgrade via a plan + - Fix: Essentia vein can be downgraded + - Fix: It is possible to build ships while having negative docks free + - Fix: Terraforming an orbit 8 fails when doing a respec + - Fix: Bleeders will upgrade past level 30 + - Fix: Empire names can be created to impersonate other empires + - Fix: Build ships does not return the ship ID + - Fix: Plans displayed in different orders in PCC,Trade and Transporter + 3.0813 - Add: When one 20 Stars tournament ends, the next one should begin automatically. - Fix: Fix an issue with skip attack messages and excavators. -- 2.51.2 From 122bd2b4145f0f96702c35cb98d836a210324b72 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Fri, 30 Sep 2011 09:37:18 -0500 Subject: [PATCH 2/2] stop multiple copies from running at the same time --- bin/diablotin/send_attack.pl | 11 ++++++++++- bin/saben/send_attack.pl | 11 ++++++++++- bin/trelvestian/send_attack.pl | 10 +++++++++- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/bin/diablotin/send_attack.pl b/bin/diablotin/send_attack.pl index 8b42e0be..3d7c0d79 100644 --- a/bin/diablotin/send_attack.pl +++ b/bin/diablotin/send_attack.pl @@ -15,6 +15,13 @@ GetOptions( ); +use Fcntl qw(:flock); +# stop multiple copies from running +unless (flock(DATA, LOCK_EX|LOCK_NB)) { + print "$0 is already running. Exiting.\n"; + exit(1); +} + out('Started'); my $start = time; @@ -77,4 +84,6 @@ sub out { } } - +__DATA__ +This exists so flock() code above works. +DO NOT REMOVE THIS DATA SECTION. diff --git a/bin/saben/send_attack.pl b/bin/saben/send_attack.pl index a9d513e6..0a95bee1 100644 --- a/bin/saben/send_attack.pl +++ b/bin/saben/send_attack.pl @@ -14,6 +14,13 @@ GetOptions( 'randomize' => \$randomize, ); +use Fcntl qw(:flock); +# stop multiple copies from running +unless (flock(DATA, LOCK_EX|LOCK_NB)) { + print "$0 is already running. Exiting.\n"; + exit(1); +} + out('Started'); @@ -88,4 +95,6 @@ sub out { } } - +__DATA__ +This exists so flock() code above works. +DO NOT REMOVE THIS DATA SECTION. diff --git a/bin/trelvestian/send_attack.pl b/bin/trelvestian/send_attack.pl index 7026c0a7..357ea487 100644 --- a/bin/trelvestian/send_attack.pl +++ b/bin/trelvestian/send_attack.pl @@ -12,6 +12,12 @@ GetOptions( 'quiet' => \$quiet, ); +use Fcntl qw(:flock); +# stop multiple copies from running +unless (flock(DATA, LOCK_EX|LOCK_NB)) { + print "$0 is already running. Exiting.\n"; + exit(1); +} out('Started'); @@ -62,4 +68,6 @@ sub out { } } - +__DATA__ +This exists so flock() code above works. +DO NOT REMOVE THIS DATA SECTION. -- 2.51.2