From 73ad3cc723006f112812a0a23782d704454adebf Mon Sep 17 00:00:00 2001
From: Ulf Seltmann <seltmann@ub.uni-leipzig.de>
Date: Wed, 27 Sep 2017 10:36:26 +0200
Subject: [PATCH] added prettyprint and tslint for showing startup
configuration
---
package-lock.json | 65 ++++++++++++++++++++++++++++++++++++++++++++++-
package.json | 4 ++-
src/server.ts | 4 +++
3 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b25abc6..4e4277d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "dacap",
- "version": "1.0.1",
+ "version": "1.0.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -2436,6 +2436,20 @@
}
}
},
+ "glob": {
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+ "dev": true,
+ "requires": {
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ },
"glob-base": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
@@ -3196,6 +3210,11 @@
"integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
"dev": true
},
+ "js-object-pretty-print": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/js-object-pretty-print/-/js-object-pretty-print-0.3.0.tgz",
+ "integrity": "sha1-RnDkUAZu4ezPNRdMfRl/WqOLz3Q="
+ },
"js-tokens": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -4223,6 +4242,12 @@
"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
"dev": true
},
+ "path-parse": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+ "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+ "dev": true
+ },
"path-to-regexp": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
@@ -6096,6 +6121,44 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz",
"integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw="
},
+ "tslint": {
+ "version": "5.7.0",
+ "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.7.0.tgz",
+ "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=",
+ "dev": true,
+ "requires": {
+ "babel-code-frame": "6.22.0",
+ "colors": "1.1.2",
+ "commander": "2.11.0",
+ "diff": "3.2.0",
+ "glob": "7.1.2",
+ "minimatch": "3.0.4",
+ "resolve": "1.4.0",
+ "semver": "5.4.1",
+ "tslib": "1.7.1",
+ "tsutils": "2.9.0"
+ },
+ "dependencies": {
+ "resolve": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
+ "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
+ "dev": true,
+ "requires": {
+ "path-parse": "1.0.5"
+ }
+ }
+ }
+ },
+ "tsutils": {
+ "version": "2.9.0",
+ "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.9.0.tgz",
+ "integrity": "sha1-fhU3tVa6tocvp+ZIXf9FsHbVUz0=",
+ "dev": true,
+ "requires": {
+ "tslib": "1.7.1"
+ }
+ },
"tty-browserify": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
diff --git a/package.json b/package.json
index 8e47d82..a9cee58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "dacap",
- "version": "1.0.3",
+ "version": "1.0.4",
"description": "proxies,compresses and caches api-requests",
"main": "bin/dacap",
"bin": {
@@ -36,6 +36,7 @@
"cors": "^2.8.4",
"debug": "^3.0.1",
"express": "^4.15.4",
+ "js-object-pretty-print": "^0.3.0",
"node-cache": "^4.1.5",
"q": "^1.5.0",
"react": "^15.6.1",
@@ -74,6 +75,7 @@
"source-map-loader": "^0.2.1",
"style-loader": "^0.18.2",
"tsc-watch": "^1.0.7",
+ "tslint": "^5.7.0",
"typescript": "^2.5.1",
"webpack": "^3.5.5",
"webpack-merge": "^4.1.0"
diff --git a/src/server.ts b/src/server.ts
index 40014d4..dbd35c1 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -6,6 +6,8 @@ import * as cache from './cache';
import * as bodyparser from 'body-parser';
import * as cors from 'cors';
import * as url from 'url';
+import * as PrettyPrint from 'js-object-pretty-print';
+
const debug = debugFactory('dacap:server');
export class Server {
@@ -27,6 +29,8 @@ export class Server {
stripPath: boolean
}) {
+ debug(`starting up with this config: ` + PrettyPrint.pretty(this.config));
+
if (this.config.stripPath === false) {
this.prePath = url.parse(this.config.proxyUrl).path;
}
--
GitLab