X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fcommod-update-receiver;h=d01b6de1753c3cbfac8b7751d0266c5af36a0116;hp=f11442854c0f31bf4029600ac5a9b705fae0db3a;hb=27941f861802c5de63b470bf87bd60c1a077bc3a;hpb=e1104ec9b3f093f6c496cd9763b06b0792b679ff diff --git a/yarrg/commod-update-receiver b/yarrg/commod-update-receiver index f114428..d01b6de 100755 --- a/yarrg/commod-update-receiver +++ b/yarrg/commod-update-receiver @@ -49,7 +49,7 @@ sub fail ($) { print header(-status=>'400 Bad commodity update', -type=>'text/plain', -charset=>'us-ascii'); - print "Error: $msg\n"; + print "\nError: $msg\n"; exit 0; } @@ -110,6 +110,8 @@ $o{'island'}= must_param('island', $re_any); my $arches= $oceans{$o{'ocean'}}; fail("unknown ocean") unless $arches; +parse_info_serverside_ocean($o{'ocean'}); + my $island_found= 0; foreach my $islands (values %$arches) { my $sources= $islands->{$o{'island'}}; @@ -133,9 +135,10 @@ foreach my $mid (<_mid-*.hold>) { unlink $mid or $!==&ENOENT or die "$mid $!"; } +$o{'instance'}= $ENV{'YARRG_INSTANCE'}; my $mcontent= MIME::Entity->build(To => 'yarrg-commod-updates', - Subject => $pwd, + Subject => $ENV{'YARRG_INSTANCE'}, Type => 'multipart/mixed', Boundary => '=', 'Message-ID' => $mid,