projects
/
APKPM.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
11f4fec
)
pass gearman timeout option correctly
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Sat, 9 Jul 2011 17:16:19 +0000
(17:16 +0000)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Sat, 9 Jul 2011 17:16:19 +0000
(17:16 +0000)
web_ui.pl
patch
|
blob
|
history
diff --git
a/web_ui.pl
b/web_ui.pl
index
d174c20
..
0331d68
100755
(executable)
--- a/
web_ui.pl
+++ b/
web_ui.pl
@@
-80,29
+80,29
@@
get '/_g/status' => sub {
};
sub _gearman_redis {
};
sub _gearman_redis {
- my ( $job, $params ) = @_;
+ my ( $job, $params
, $timeout
) = @_;
my $key = $params;
$key =~ s/\W+/_/gs;
$key =~ s/\s+/_/gs;
$key = "sql.$key";
my $key = $params;
$key =~ s/\W+/_/gs;
$key =~ s/\s+/_/gs;
$key = "sql.$key";
- warn "# _gearman_redis $key";
+ warn "# _gearman_redis $key
[$timeout s]
";
my $redis = Redis->new;
my $ret;
if ( $ret = $redis->get($key) ) {
warn "redis hit $key\n";
my $redis = Redis->new;
my $ret;
if ( $ret = $redis->get($key) ) {
warn "redis hit $key\n";
- $redis->expire($key => 15); # refresh key timeout
} else {
} else {
- $gearman->timeout(
15
);
+ $gearman->timeout(
$timeout
);
$ret = $gearman->req( 'SUBMIT_JOB', $job, '', $params );
die "no result for $params" unless $ret;
$redis->set($key => $ret);
$ret = $gearman->req( 'SUBMIT_JOB', $job, '', $params );
die "no result for $params" unless $ret;
$redis->set($key => $ret);
- $redis->expire($key => 15);
}
}
+ $redis->expire($key => 60); # refresh redis key timeout
+
$ret = Mojo::JSON->new->decode( $ret );
if ( ! exists $ret->{error} && ref $ret->{columns} ne 'ARRAY' ) {
$ret = Mojo::JSON->new->decode( $ret );
if ( ! exists $ret->{error} && ref $ret->{columns} ne 'ARRAY' ) {
@@
-130,7
+130,7
@@
get '/gnuplot' => sub {
$sql =~ s/\s+(from|where|order|limit|join)/\n$1/gs;
$self->param( sql => $sql );
$sql =~ s/\s+(from|where|order|limit|join)/\n$1/gs;
$self->param( sql => $sql );
- my $ret = _gearman_redis( 'Store_sql' => $sql );
+ my $ret = _gearman_redis( 'Store_sql' => $sql
, $self->param('timeout')
);
return $self->render('gnuplot', sql => $sql, img => '', gnuplot => $ret->{error} )
if exists $ret->{error};
return $self->render('gnuplot', sql => $sql, img => '', gnuplot => $ret->{error} )
if exists $ret->{error};