Skip to content

Commit e92bbb9

Browse files
0e10e1
committed
Adiciona versão cached de api. #58 
1 parent 6d19ea3 commit e92bbb9

File tree

2 files changed

+135
-115
lines changed

2 files changed

+135
-115
lines changed

‎src/config.nginx

Lines changed: 30 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22
# Servidores OSM.CODES
33
##
44

5-
# Define upstreams
6-
# PRODUCAO: dl05s_main em :3105
5+
# upstreams
76
upstream prod_backend {
8-
server 127.0.0.1:3105;
7+
server 127.0.0.1:3105; # Produção: dl05s_main em 3105
98
}
109

1110
upstream test_backend {
12-
server 127.0.0.1:3106;
11+
server 127.0.0.1:3106; # Teste: dl06t_main em 3106
1312
keepalive 8;
1413
}
1514

16-
# PRODUCAO
15+
# PRODUÇÃO
1716
server {
1817
server_name osm.codes www.osm.codes afa.codes www.afa.codes;
1918
listen 443 ssl http2;
@@ -256,41 +255,35 @@ server {
256255
access_log /var/log/nginx/test.osm.codes.access_log;
257256
error_log /var/log/nginx/test.osm.codes.error.log;
258257

259-
# schema api, deve migrar para api.test.afa.codes
260-
## return csv
258+
## return csv, schema api, deve migrar para api.test.afa.codes
261259
location /_sql.csv {
262260
rewrite /_sql.csv/(.*) /$1 break;
263-
264261
proxy_set_header Accept 'text/csv';
265262
proxy_pass http://test_backend;
266263
}
267264

268265
## return json default postgrest
269266
location /_sql {
270267
rewrite ^/_sql/(.*) /$1 break;
271-
272268
proxy_pass http://test_backend;
273269
}
274270

275271
# encode logistics
276272
location ~* "^/geo:\-?\d+\.?\d*,\-?\d+\.?\d*(;u=\d+\.?\d*)?\.json(/[a-z]{2}-[a-z0-9]{1,3}-[a-z0-9]+)?$" {
277-
### sem grid
278-
rewrite "^/(geo:.*);(u=.*)\.json$" "/rpc/afacode_encode_log_no_context?p_uri=$1%3B$2&p_grid=0" break;
279-
rewrite "^/(geo:.*)\.json$" "/rpc/afacode_encode_log_no_context?p_uri=$1&p_grid=0" break;
273+
rewrite "^/(geo:.*);(u=.*)\.json$" "/rpc/afacode_encode_log_no_context?p_uri=$1%3B$2&p_grid=0" break;
274+
rewrite "^/(geo:.*)\.json$" "/rpc/afacode_encode_log_no_context?p_uri=$1&p_grid=0" break;
280275
rewrite "^/(geo:.*);(u=.*)\.json/(.+)$" "/rpc/afacode_encode_log?p_uri=$1%3B$2&p_grid=0&p_isolabel_ext=$3" break;
281-
rewrite "^/(geo:.*)\.json/(.+)$" "/rpc/afacode_encode_log?p_uri=$1&p_grid=0&p_isolabel_ext=$2" break;
276+
rewrite "^/(geo:.*)\.json/(.+)$" "/rpc/afacode_encode_log?p_uri=$1&p_grid=0&p_isolabel_ext=$2" break;
282277
proxy_pass http://test_backend;
283278
}
284279

285280
# encode scientific
286281
location ~* "^/geo:\-?\d+\.?\d*,\-?\d+\.?\d*(;u=\d+\.?\d*)?\.json/base16h(/grid(2|4|8|16|3|5|9|17))?(/[a-z]{2})?$" {
287-
# sem grid
288-
rewrite "^/(geo:.*);(u=.*)\.json/base16h$" "/rpc/afacode_encode?p_uri=$1%3B$2&p_grid=0" break;
289-
rewrite "^/(geo:.*)\.json/base16h$" "/rpc/afacode_encode?p_uri=$1&p_grid=0" break;
290-
rewrite "^/(geo:.*);(u=.*)\.json/base16h/(.+)$" "/rpc/afacode_encode?p_uri=$1%3B$2&p_iso=$3&p_grid=0" break;
291-
rewrite "^/(geo:.*)\.json/base16h/(.+)$" "/rpc/afacode_encode?p_uri=$1&p_grid=0&p_iso=$2" break;
282+
rewrite "^/(geo:.*);(u=.*)\.json/base16h$" "/rpc/afacode_encode?p_uri=$1%3B$2&p_grid=0" break;
283+
rewrite "^/(geo:.*)\.json/base16h$" "/rpc/afacode_encode?p_uri=$1&p_grid=0" break;
284+
rewrite "^/(geo:.*);(u=.*)\.json/base16h/(.+)$" "/rpc/afacode_encode?p_uri=$1%3B$2&p_iso=$3&p_grid=0" break;
285+
rewrite "^/(geo:.*)\.json/base16h/(.+)$" "/rpc/afacode_encode?p_uri=$1&p_grid=0&p_iso=$2" break;
292286

293-
# com grid
294287
rewrite "^/(geo:.*);(u=.*)\.json/base16h/grid(\d+)$" "/rpc/afacode_encode?p_uri=$1%3B$2&p_grid=$3" break;
295288
rewrite "^/(geo:.*)\.json/base16h/grid(\d+)$" "/rpc/afacode_encode?p_uri=$1&p_grid=$3" break;
296289
rewrite "^/(geo:.*);(u=.*)\.json/base16h/grid(\d+)/(.+)$" "/rpc/afacode_encode?p_uri=$1%3B$2&p_iso=$4&p_grid=$3" break;
@@ -307,76 +300,49 @@ server {
307300

308301
# decode logistic (CO-ANT-Itagui, CO-A-Itagui) divipola/ibgegeocodigo/cmcode
309302
location ~* "^/(geo:afa:)?(([a-z]{2}((-[a-z0-9]+){1,2})))(~|-)([a-z0-9]+)\.json$" {
310-
rewrite "(?i)^/(geo:afa:)?(.+)\.json$" /rpc/afacode_decode_log?p_code=$2 break;
303+
rewrite "(?i)^/(geo:afa:)?(.+)\.json$" /rpc/afacode_decode_log?p_code=$2 break;
311304
proxy_pass http://test_backend;
312305
}
313306

314307
# geo:iso_ext
315308
location ~* "^/(geo:iso_ext:)?([a-z]{2}((-[a-z0-9]+){0,2}))\.json(/cover)?$" {
316-
rewrite "(?i)^/(geo:iso_ext:)?(.+)\.json$" /rpc/jurisdiction_geojson_from_isolabel?p_code=$2 break;
317-
rewrite "(?i)^/(geo:iso_ext:)?(.+)\.json/cover$" /rpc/jurisdiction_coverage?p_iso=$2 break;
309+
rewrite "(?i)^/(geo:iso_ext:)?(.+)\.json$" /rpc/jurisdiction_geojson_from_isolabel_cached?p_iso=$2 break;
310+
rewrite "(?i)^/(geo:iso_ext:)?(.+)\.json/cover$" /rpc/jurisdiction_coverage_cached?p_iso=$2 break;
318311
proxy_pass http://test_backend;
319312
}
320313

321314
# geo:iso_ext2
322315
location ~* "^/(geo:iso_ext2:)?([a-z]{2}((-[a-z0-9]+){0,2}))\.json$" {
323-
rewrite "(?i)^/(geo:iso_ext2:)?(.+)\.json$" /rpc/jurisdiction_geojson_from_isolabel2?p_code=$2 break;
316+
rewrite "(?i)^/(geo:iso_ext2:)?(.+)\.json$" /rpc/jurisdiction_geojson_from_isolabel2_cached?p_iso=$2 break;
324317
proxy_pass http://test_backend;
325318
}
326319

327320
# geo:co-divipola|br-geocodigo
328321
location ~* "^/(geo:(co-divipola|br-geocodigo|cm-code):[0-9]+)\.json(/cover?)?$" {
329-
rewrite "(?i)^/geo:((co|br|cm)-).+:([0-9]+)\.json$" /rpc/jurisdiction_geojson_from_isolabel?p_code=$1$3 break;
330-
rewrite "(?i)^/geo:((co|br|cm)-).+:([0-9]+)\.json/cover$" /rpc/jurisdiction_coverage?p_iso=$1$3 break;
322+
rewrite "(?i)^/geo:((co|br|cm)-).+:([0-9]+)\.json$" /rpc/jurisdiction_geojson_from_isolabel_cached?p_iso=$1$3 break;
323+
rewrite "(?i)^/geo:((co|br|cm)-).+:([0-9]+)\.json/cover$" /rpc/jurisdiction_coverage_cached?p_iso=$1$3 break;
331324
proxy_pass http://test_backend;
332325
}
333326

334327
# (urn|geo):lex
335328
location ~* "^/(urn|geo):lex:([a-z]{2}(;[a-z0-9\.]+)?(;[a-z0-9\.]+)?)\.json(/cover)?$" {
336-
rewrite "(?i)^/(urn|geo):lex:([a-z]{2})\.json$"
337-
/rpc/jurisdiction_geojson_from_isolabel?p_code=$2 break;
338-
339-
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9]{2})\.json$"
340-
/rpc/jurisdiction_geojson_from_isolabel?p_code=$2%3B$3 break;
341-
342-
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9]{2});([a-z\.]+)\.json$"
343-
/rpc/jurisdiction_geojson_from_isolabel?p_code=$2%3B$3%3B$4 break;
344-
345-
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9\.]{3,})\.json$"
346-
/rpc/jurisdiction_geojson_from_isolabel?p_code=$2%3B$3 break;
347-
348-
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9\.]{3,});([a-z0-9\.]+)?\.json$"
349-
/rpc/jurisdiction_geojson_from_isolabel?p_code=$2%3B$3%3B$4 break;
350-
351-
352-
rewrite "(?i)^/(urn|geo):lex:([a-z]{2})\.json/cover$"
353-
/rpc/jurisdiction_coverage?p_iso=$2 break;
354-
355-
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9]{2})\.json/cover$"
356-
/rpc/jurisdiction_coverage?p_iso=$2%3B$3 break;
357-
358-
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9]{2});([a-z0-9\.]+)\.json/cover$"
359-
/rpc/jurisdiction_coverage?p_iso=$2%3B$3%3B$4 break;
360-
361-
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9\.]{3,})\.json/cover$"
362-
/rpc/jurisdiction_coverage?p_iso=$2%3B$3 break;
363-
364-
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9\.]{3,});([a-z0-9\.]+)?\.json/cover$"
365-
/rpc/jurisdiction_coverage?p_iso=$2%3B$3%3B$4 break;
366-
367-
329+
rewrite "(?i)^/(urn|geo):lex:([a-z]{2})\.json$" /rpc/jurisdiction_geojson_from_isolabel_cached?p_iso=$2 break;
330+
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9]{2})\.json$" /rpc/jurisdiction_geojson_from_isolabel_cached?p_iso=$2%3B$3 break;
331+
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9]{2});([a-z\.]+)\.json$" /rpc/jurisdiction_geojson_from_isolabel_cached?p_iso=$2%3B$3%3B$4 break;
332+
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9\.]{3,})\.json$" /rpc/jurisdiction_geojson_from_isolabel_cached?p_iso=$2%3B$3 break;
333+
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9\.]{3,});([a-z0-9\.]+)?\.json$" /rpc/jurisdiction_geojson_from_isolabel_cached?p_iso=$2%3B$3%3B$4 break;
334+
rewrite "(?i)^/(urn|geo):lex:([a-z]{2})\.json/cover$" /rpc/jurisdiction_coverage_cached?p_iso=$2 break;
335+
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9]{2})\.json/cover$" /rpc/jurisdiction_coverage_cached?p_iso=$2%3B$3 break;
336+
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9]{2});([a-z0-9\.]+)\.json/cover$" /rpc/jurisdiction_coverage_cached?p_iso=$2%3B$3%3B$4 break;
337+
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9\.]{3,})\.json/cover$" /rpc/jurisdiction_coverage_cached?p_iso=$2%3B$3 break;
338+
rewrite "(?i)^/(urn|geo):lex:([a-z]{2});([a-z0-9\.]{3,});([a-z0-9\.]+)?\.json/cover$" /rpc/jurisdiction_coverage_cached?p_iso=$2%3B$3%3B$4 break;
368339
proxy_pass http://test_backend;
369340
}
370341

371342
# ENCODE OLC|GHS
372343
location ~* "^/geo:(olc|ghs):\-?\d+\.?\d*,\-?\d+\.?\d*(;u=\d+\.?\d*)?\.json$" {
373-
374-
rewrite "^/(geo:(olc|ghs):\-?\d+\.?\d*,\-?\d+\.?\d*);(u=\d+\.?\d*)\.json$"
375-
"/rpc/$2_encode?uri=$1%3B$3" break;
376-
377-
rewrite "^/(geo:(olc|ghs):\-?\d+\.?\d*,\-?\d+\.?\d*)\.json$"
378-
"/rpc/$2_encode?uri=$1" break;
379-
344+
rewrite "^/(geo:(olc|ghs):\-?\d+\.?\d*,\-?\d+\.?\d*);(u=\d+\.?\d*)\.json$" "/rpc/$2_encode?uri=$1%3B$3" break;
345+
rewrite "^/(geo:(olc|ghs):\-?\d+\.?\d*,\-?\d+\.?\d*)\.json$" "/rpc/$2_encode?uri=$1" break;
380346
proxy_pass http://test_backend;
381347
}
382348

0 commit comments

Comments
 (0)