@abtnode/router-provider 1.16.11-next-3d2b39f7 → 1.16.11-next-d32a90d4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/nginx/includes/proxy +1 -0
- package/lib/nginx/index.js +3 -1
- package/lib/nginx/util.js +1 -1
- package/package.json +6 -6
package/lib/nginx/includes/proxy
CHANGED
|
@@ -7,6 +7,7 @@ proxy_hide_header X-Powered-By;
|
|
|
7
7
|
proxy_set_header Host $host;
|
|
8
8
|
proxy_set_header X-Real-IP $remote_addr;
|
|
9
9
|
proxy_set_header X-Real-Uri $uri;
|
|
10
|
+
proxy_set_header X-Request-ID $request_id;
|
|
10
11
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
11
12
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
12
13
|
proxy_set_header X-Forwarded-Host $host;
|
package/lib/nginx/index.js
CHANGED
|
@@ -712,6 +712,7 @@ class NginxProvider extends BaseProvider {
|
|
|
712
712
|
return;
|
|
713
713
|
}
|
|
714
714
|
|
|
715
|
+
block._add('add_header', 'X-Request-ID $request_id');
|
|
715
716
|
Object.keys(headers).forEach((key) => {
|
|
716
717
|
block._add('add_header', `${key} ${headers[key]}`);
|
|
717
718
|
});
|
|
@@ -727,6 +728,7 @@ class NginxProvider extends BaseProvider {
|
|
|
727
728
|
server._add('location', '/');
|
|
728
729
|
const location = server.location[server.location.length - 1];
|
|
729
730
|
location._add('try_files', '$uri /404.html break');
|
|
731
|
+
location._add('add_header', 'X-Request-ID $request_id');
|
|
730
732
|
}
|
|
731
733
|
|
|
732
734
|
_getLastServer(conf) {
|
|
@@ -808,8 +810,8 @@ class NginxProvider extends BaseProvider {
|
|
|
808
810
|
listen = `${listen} default_server`;
|
|
809
811
|
}
|
|
810
812
|
|
|
811
|
-
httpsServerUnit._add('listen', listen);
|
|
812
813
|
httpsServerUnit._add('server_name', serverName);
|
|
814
|
+
httpsServerUnit._add('listen', listen);
|
|
813
815
|
httpsServerUnit._add('ssl_certificate', crtPath);
|
|
814
816
|
httpsServerUnit._add('ssl_certificate_key', keyPath);
|
|
815
817
|
httpsServerUnit._add('include', 'includes/ssl');
|
package/lib/nginx/util.js
CHANGED
|
@@ -183,7 +183,7 @@ http {
|
|
|
183
183
|
|
|
184
184
|
absolute_redirect off;
|
|
185
185
|
|
|
186
|
-
log_format compression '$remote_addr - $remote_user [$time_local] '
|
|
186
|
+
log_format compression '$remote_addr - $remote_user [$time_local] $request_id '
|
|
187
187
|
'"$host" "$request" $status $body_bytes_sent '
|
|
188
188
|
'"$http_referer" "$http_user_agent" "$http_x_forwarded_for" $request_time';
|
|
189
189
|
access_log ${path.join(logDir, 'access.log')} compression;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abtnode/router-provider",
|
|
3
|
-
"version": "1.16.11-next-
|
|
3
|
+
"version": "1.16.11-next-d32a90d4",
|
|
4
4
|
"description": "Routing engine implementations for abt node",
|
|
5
5
|
"author": "polunzh <polunzh@gmail.com>",
|
|
6
6
|
"homepage": "https://github.com/ArcBlock/blocklet-server#readme",
|
|
@@ -32,10 +32,10 @@
|
|
|
32
32
|
"url": "https://github.com/ArcBlock/blocklet-server/issues"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@abtnode/constant": "1.16.11-next-
|
|
36
|
-
"@abtnode/logger": "1.16.11-next-
|
|
37
|
-
"@abtnode/router-templates": "1.16.11-next-
|
|
38
|
-
"@abtnode/util": "1.16.11-next-
|
|
35
|
+
"@abtnode/constant": "1.16.11-next-d32a90d4",
|
|
36
|
+
"@abtnode/logger": "1.16.11-next-d32a90d4",
|
|
37
|
+
"@abtnode/router-templates": "1.16.11-next-d32a90d4",
|
|
38
|
+
"@abtnode/util": "1.16.11-next-d32a90d4",
|
|
39
39
|
"@arcblock/http-proxy": "^1.19.1",
|
|
40
40
|
"axios": "^0.27.2",
|
|
41
41
|
"debug": "^4.3.4",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"bluebird": "^3.7.2",
|
|
61
61
|
"fs-extra": "^10.1.0"
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "4f39f40bf7a87767f885d3a06f785d9d76b82da4"
|
|
64
64
|
}
|