Commit 5f3c5bab authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Another mysql 5.7 date fix.

parent 12446686
...@@ -727,8 +727,20 @@ sub GetTicketAuxAux($$$$$$$$$$$) ...@@ -727,8 +727,20 @@ sub GetTicketAuxAux($$$$$$$$$$$)
# Mark the expires slot in the experiment, for admission control # Mark the expires slot in the experiment, for admission control
# during the mapper run. # during the mapper run.
# #
if ($slice_experiment->SetExpiration(defined($expires) ? $expires : # Convert to a localtime.
$slice->expires())) { #
if (defined($expires)) {
$expires = eval { timegm(strptime($expires)); };
if ($@ || !defined($expires)) {
$response = GeniResponse->Create(GENIRESPONSE_BADARGS, undef,
"Could not parse expiration");
goto bad;
}
}
else {
$expires = $slice->expires();
}
if ($slice_experiment->SetExpiration($expires)) {
$response = GeniResponse->Create(GENIRESPONSE_ERROR, undef, $response = GeniResponse->Create(GENIRESPONSE_ERROR, undef,
"set experiment expiration"); "set experiment expiration");
print STDERR "Could not set experiment expiration\n"; print STDERR "Could not set experiment expiration\n";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment