Skip to content

Commit

Permalink
Merge 114b180 into bbd75b2
Browse files Browse the repository at this point in the history
  • Loading branch information
paultcochrane committed Nov 6, 2017
2 parents bbd75b2 + 114b180 commit 149f26f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions LICENSE
Expand Up @@ -292,21 +292,21 @@ Definitions:

- "Package" refers to the collection of files distributed by the Copyright
Holder, and derivatives of that collection of files created through
textual modification.
textual modification.
- "Standard Version" refers to such a Package if it has not been modified,
or has been modified in accordance with the wishes of the Copyright
Holder.
Holder.
- "Copyright Holder" is whoever is named in the copyright or copyrights for
the package.
the package.
- "You" is you, if you're thinking about copying or distributing this Package.
- "Reasonable copying fee" is whatever you can justify on the basis of media
cost, duplication charges, time of people involved, and so on. (You will
not be required to justify it to the Copyright Holder, but only to the
computing community at large as a market that must bear the fee.)
computing community at large as a market that must bear the fee.)
- "Freely Available" means that no fee is charged for the item itself, though
there may be fees involved in handling the item. It also means that
recipients of the item may redistribute it under the same conditions they
received it.
received it.

1. You may make and give away verbatim copies of the source form of the
Standard Version of this Package without restriction, provided that you
Expand Down
2 changes: 1 addition & 1 deletion dist.ini
Expand Up @@ -105,7 +105,7 @@ changelog = CHANGES
tag_message = %N v%v - %{yyyy-MM-dd}d%n%n%c ; Tag annotations show up in github release list

; NextRelease acts *during* pre-release to write $VERSION and
; timestamp to Changes and *after* release to add a new
; timestamp to Changes and *after* release to add a new
; section, so to act at the right time after release, it must actually
; come after Commit_Dirty_Files but before Commit_Changes in the
; dist.ini. It will still act during pre-release as usual
Expand Down
10 changes: 5 additions & 5 deletions lib/Minion/Backend/mysql.pm
Expand Up @@ -161,9 +161,9 @@ sub repair {
);
}

sub reset {
sub reset {
my $self = shift;

$self->mysql->db->query("truncate table minion_jobs");
$self->mysql->db->query("truncate table minion_workers");
}
Expand Down Expand Up @@ -222,7 +222,7 @@ sub worker_info {
my ($self, $id) = @_;

my $hash = $self->mysql->db->query(
"select `id`, UNIX_TIMESTAMP(`notified`) as `notified`, `host`,
"select `id`, UNIX_TIMESTAMP(`notified`) as `notified`, `host`,
`pid`, UNIX_TIMESTAMP(`started`) as `started`
from `minion_workers`
where id = ?", $id
Expand Down Expand Up @@ -256,14 +256,14 @@ sub _try {
my $job = $tx->db->query(qq(select id, args, retries, task from minion_jobs
where state = 'inactive' and `delayed` <= NOW() and queue in ($qq)
and task in ($qt)
order by priority desc, created limit 1 for update),
order by priority desc, created limit 1 for update),
@{ $options->{queues} || ['default']}, @{ $tasks }
)->hash;

return undef unless $job;

$tx->db->query(
qq(update minion_jobs set started = now(), state = 'active', worker = ? where id = ?),
qq(update minion_jobs set started = now(), state = 'active', worker = ? where id = ?),
$id, $job->{id}
);
$tx->commit;
Expand Down

0 comments on commit 149f26f

Please sign in to comment.