Author: eelco
Date: Fri Nov 25 12:35:33 2011
New Revision: 30556
URL: https://nixos.org/websvn/nix/?rev=30556&sc=1
Log:
* Add a patch to prevent Starman from changing its process name
to "starman worker" or "starman master". This prevented libcgroup
from determining the process name correctly.
Added:
nixpkgs/trunk/pkgs/development/perl-modules/starman-dont-change-name.patch
Modified:
nixpkgs/trunk/pkgs/top-level/perl-packages.nix
Added:
nixpkgs/trunk/pkgs/development/perl-modules/starman-dont-change-name.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/perl-modules/starman-dont-change-name.patch
Fri Nov 25 12:35:33 2011 (r30556)
@@ -0,0 +1,23 @@
+Changing the process name breaks applying libcgroup rules, so don't do it.
+
+diff -ru -x '*~' Starman-0.2014-orig/lib/Starman/Server.pm
Starman-0.2014/lib/Starman/Server.pm
+--- Starman-0.2014-orig/lib/Starman/Server.pm 2011-08-27 01:19:43.000000000
+0200
++++ Starman-0.2014/lib/Starman/Server.pm 2011-11-25 13:30:24.570434653
+0100
+@@ -100,7 +100,7 @@
+
+ sub run_parent {
+ my $self = shift;
+- $0 = "starman master " . join(" ", @{$self->{options}{argv} || []});
++ #$0 = "starman master " . join(" ", @{$self->{options}{argv} || []});
+ $self->SUPER::run_parent(@_);
+ }
+
+@@ -113,7 +113,7 @@
+ DEBUG && warn "[$$] Initializing the PSGI app\n";
+ $self->{app} = $self->{options}->{psgi_app_builder}->();
+ }
+- $0 = "starman worker " . join(" ", @{$self->{options}{argv} || []});
++ #$0 = "starman worker " . join(" ", @{$self->{options}{argv} || []});
+ }
+
+ sub post_accept_hook {
Modified: nixpkgs/trunk/pkgs/top-level/perl-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/perl-packages.nix Fri Nov 25 10:18:36
2011 (r30555)
+++ nixpkgs/trunk/pkgs/top-level/perl-packages.nix Fri Nov 25 12:35:33
2011 (r30556)
@@ -3024,6 +3024,7 @@
url = "mirror://cpan/modules/by-module/Plack/${name}.tar.gz";
sha256 = "0hf3wpm2q4zcgjahjrpkkzy4fn74vkddg9yqs7p97xb290pvlbki";
};
+ patches = [ ../development/perl-modules/starman-dont-change-name.patch ];
buildInputs = [ TestRequires TestTCP ];
propagatedBuildInputs = [ Plack DataDump HTTPParserXS NetServer ];
doCheck = false; # binds to various TCP ports1
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
