Cleaning up.

dist/app.js

@@ -1,14 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var wtfnode = require("wtfnode"); // Debugging the event loop
-// const util = require("util")
 var express = require("express");
-var req_logging_1 = require("./middleware/req-logging");
 // Middleware
 var route_ratelimit_1 = require("./middleware/route-ratelimit");
 var path = require("path");
-var logger = require("morgan");
-var wlogger = require("./util/winston-logging");
 var cookieParser = require("cookie-parser");
 var bodyParser = require("body-parser");
 // const basicAuth = require("express-basic-auth")
@@ -17,7 +12,6 @@ var debug = require("debug")("rest-cloud:server");
 var http = require("http");
 var cors = require("cors");
 var AuthMW = require("./middleware/auth");
-var swStats = require("swagger-stats");
 var apiSpec;
 if (process.env.NETWORK === "mainnet") {
     apiSpec = require("./public/oracles-cash-mainnet-rest-v1.json");
@@ -31,22 +25,17 @@ var priceV1 = require("./routes/v1/price");
 require("dotenv").config();
 var app = express();
 app.locals.env = process.env;
-app.use(swStats.getMiddleware({ swaggerSpec: apiSpec }));
 app.use(helmet());
 app.use(cors());
 app.enable("trust proxy");
 // view engine setup
 app.set("views", path.join(__dirname, "views"));
 app.set("view engine", "jade");
 app.use("/public", express.static(__dirname + "/public"));
-// Log each request to the console with IP addresses.
-app.use(logger(":remote-addr :remote-user :method :url :status :response-time ms - :res[content-length] :user-agent"));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, "public")));
-// Local logging middleware for tracking incoming connection information.
-app.use("/", req_logging_1.logReqInfo);
 // Make io accessible to our router
 app.use(function (req, res, next) {
     req.io = io;
@@ -101,19 +90,6 @@ server.on("listening", onListening);
 // Set the time before a timeout error is generated. This impacts testing and
 // the handling of timeout errors. Is 10 seconds too agressive?
 server.setTimeout(30 * 1000);
-// Dump details about the event loop to debug a possible memory leak
-wtfnode.setLogger("info", function (data) {
-    wlogger.verbose("wtfnode info: " + data);
-});
-wtfnode.setLogger("warn", function (data) {
-    wlogger.verbose("wtfnode warn: " + data);
-});
-wtfnode.setLogger("error", function (data) {
-    wlogger.verbose("wtfnode error: " + data);
-});
-setInterval(function () {
-    wtfnode.dump();
-}, 60000 * 5);
 /**
  * Normalize a port into a number, string, or false.
  */

dist/middleware/auth.js

@@ -12,7 +12,6 @@
 var passport = require("passport");
 var BasicStrategy = require("passport-http").BasicStrategy;
 var AnonymousStrategy = require("passport-anonymous");
-var wlogger = require("../util/winston-logging");
 // Used for debugging and iterrogating JS objects.
 var util = require("util");
 util.inspect.defaultOptions = { depth: 1 };

src/app.ts

@@ -1,16 +1,10 @@
 "use strict"
 
-const wtfnode = require("wtfnode") // Debugging the event loop
-// const util = require("util")
-
 import * as express from "express"
-import { logReqInfo } from "./middleware/req-logging"
 // Middleware
 import { routeRateLimit } from "./middleware/route-ratelimit"
 
 const path = require("path")
-const logger = require("morgan")
-const wlogger = require("./util/winston-logging")
 const cookieParser = require("cookie-parser")
 const bodyParser = require("body-parser")
 // const basicAuth = require("express-basic-auth")
@@ -20,7 +14,6 @@ const http = require("http")
 const cors = require("cors")
 const AuthMW = require("./middleware/auth")
 
-const swStats = require("swagger-stats")
 let apiSpec
 if (process.env.NETWORK === "mainnet") {
   apiSpec = require("./public/oracles-cash-mainnet-rest-v1.json")
@@ -43,8 +36,6 @@ const app: express.Application = express()
 
 app.locals.env = process.env
 
-app.use(swStats.getMiddleware({ swaggerSpec: apiSpec }))
-
 app.use(helmet())
 
 app.use(cors())
@@ -56,20 +47,12 @@ app.set("view engine", "jade")
 
 app.use("/public", express.static(`${__dirname}/public`))
 
-// Log each request to the console with IP addresses.
-app.use(
-  logger(
-    `:remote-addr :remote-user :method :url :status :response-time ms - :res[content-length] :user-agent`
-  )
-)
-
 app.use(bodyParser.json())
 app.use(bodyParser.urlencoded({ extended: false }))
 app.use(cookieParser())
 app.use(express.static(path.join(__dirname, "public")))
 
 // Local logging middleware for tracking incoming connection information.
-app.use(`/`, logReqInfo)
 
 //
 // let username = process.env.USERNAME;
@@ -165,20 +148,6 @@ server.on("listening", onListening)
 // the handling of timeout errors. Is 10 seconds too agressive?
 server.setTimeout(30 * 1000)
 
-// Dump details about the event loop to debug a possible memory leak
-wtfnode.setLogger("info", function(data) {
-  wlogger.verbose(`wtfnode info: ${data}`)
-})
-wtfnode.setLogger("warn", function(data) {
-  wlogger.verbose(`wtfnode warn: ${data}`)
-})
-wtfnode.setLogger("error", function(data) {
-  wlogger.verbose(`wtfnode error: ${data}`)
-})
-setInterval(function() {
-  wtfnode.dump()
-}, 60000 * 5)
-
 /**
  * Normalize a port into a number, string, or false.
  */

src/middleware/auth.js

@@ -14,7 +14,6 @@
 const passport = require("passport")
 const BasicStrategy = require("passport-http").BasicStrategy
 const AnonymousStrategy = require("passport-anonymous")
-const wlogger = require("../util/winston-logging")
 
 // Used for debugging and iterrogating JS objects.
 const util = require("util")

src/routes/v1/price.ts

@@ -6,7 +6,6 @@ import * as express from "express"
 import * as util from "util"
 import { PriceOracle } from "./PriceOracle"
 import routeUtils = require("./route-utils")
-import wlogger = require("../../util/winston-logging")
 
 // consts
 const router: express.Router = express.Router()
@@ -67,10 +66,6 @@ async function details(
       return res.json({ error: msg })
     }
 
-    // Write out error to error log.
-    //logger.error(`Error in price.ts/details: `, err)
-    wlogger.error(`Error in price.ts/details().`, err)
-
     res.status(500)
     return res.json({ error: util.inspect(err) })
   }

src/routes/v1/route-utils.js

@@ -4,7 +4,6 @@
 
 const axios = require("axios")
 const logger = require("./logging.js")
-const wlogger = require("../../util/winston-logging")
 
 const util = require("util")
 util.inspect.defaultOptions = { depth: 1 }
@@ -136,7 +135,6 @@ function decodeError(err) {
 
     return { msg: false, status: 500 }
   } catch (err) {
-    wlogger.error(`unhandled error in route-utils.js/decodeError(): `, err)
     return { msg: false, status: 500 }
   }
 }