Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/MGRAST/cgi/api.cgi
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ else {
my $cgi_url = $cgi->url;
$cgi_url =~ s/^(.*)\/$/$1/;
$cgi_url =~ s/^(.*)\/api.cgi$/$1/;
my @res = map {{ 'name' => $_, 'url' => $cgi_url.'/'.$_ , 'documentation' => $cgi_url.'/api.html#'.$_}} sort @$resources;
my @res = map {{ 'name' => $_, 'url' => $cgi->url.'/'.$_ , 'documentation' => $cgi_url.'/api.html#'.$_}} sort @$resources;
my $content = { version => 1,
service => 'MG-RAST',
url => $cgi->url,
Expand Down
37 changes: 24 additions & 13 deletions src/MGRAST/lib/resources/resource.pm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use Data::Dumper;
use CGI;
use JSON;
use LWP::UserAgent;
use Cache::Memcached;
use Digest::MD5 qw(md5_hex md5_base64);

1;
Expand All @@ -18,8 +17,13 @@ sub new {
my ($class, $params) = @_;

# set variables
my $memd = undef;
eval {
require Cache::Memcached;
Cache::Memcached->import();
$memd = new Cache::Memcached {'servers' => [$Conf::web_memcache], 'debug' => 0, 'compress_threshold' => 10_000};
};
my $agent = LWP::UserAgent->new;
my $memd = new Cache::Memcached {'servers' => [$Conf::web_memcache], 'debug' => 0, 'compress_threshold' => 10_000};
my $json = JSON->new;
my $url_id = get_url_id($params->{cgi}, $params->{resource}, $params->{rest_parameters}, $params->{json_rpc}, $params->{user});
$json = $json->utf8();
Expand Down Expand Up @@ -217,10 +221,15 @@ sub request {
# get a connection to the datasource
sub connect_to_datasource {
my ($self) = @_;
use WebServiceObject;

my ($master, $error) = WebServiceObject::db_connect();
if ($error) {
my ($master, $error);
eval {
require WebServiceObject;
WebServiceObject->import();
($master, $error) = WebServiceObject::db_connect();
};

if ($@ || $error || (! $master)) {
$self->return_data({ "ERROR" => "resource database offline" }, 503);
} else {
return $master;
Expand Down Expand Up @@ -265,12 +274,14 @@ sub check_pagination {
sub return_cached {
my ($self) = @_;

my $cached = $self->memd->get($self->url_id);
if ($cached) {
# do a runaround on ->return_data
print $self->header;
print $cached;
exit 0;
if ($self->memd) {
my $cached = $self->memd->get($self->url_id);
if ($cached) {
# do a runaround on ->return_data
print $self->header;
print $cached;
exit 0;
}
}
}

Expand Down Expand Up @@ -320,7 +331,7 @@ sub return_data {
result => $data,
id => $self->json_rpc_id };
# cache this!
if ($cache_me) {
if ($cache_me && $self->memd) {
$self->memd->set($self->url_id, $self->json->encode($data), $self->{expire});
}
}
Expand All @@ -345,7 +356,7 @@ sub return_data {
$data = $self->json->encode($data);
}
# cache this!
if ($cache_me) {
if ($cache_me && $self->memd) {
$self->memd->set($self->url_id, $data, $self->{expire});
}
# send it
Expand Down