fixed merge conflict - delete index.js

dzdrazil · Jul 15, 2015 · 24ae295 · 24ae295
2 parents a254d72 + f18931d
commit 24ae295
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 328 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -58,11 +58,14 @@ module.exports = function (config) {
         path = '/' + path;
       }
 
-      console.log('Request: %s %s', req.method, path);
       var matchingRoute = router.match('/' + method + path);
 
       if (!matchingRoute) return next();
 
+      if (process.env.debug) {
+        console.log('Request: %s %s', req.method, path);
+      }
+
       try {
         var response = matchingRoute.fn();
         res.setHeader('Content-Type', 'application/json');

diff --git a/index.js b/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-mock-api",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Creates a connect middleware mock API from a Swagger 2.0 YAML file",
   "main": "dist/index.js",
   "repository": {

diff --git a/src/ConfigureRouter.js b/src/ConfigureRouter.js
@@ -53,7 +53,10 @@ export default function ConfigureRouter(paths) {
       if (!path.hasOwnProperty(mk)) continue;
 
       let method = path[mk];
-      console.log('ADDING ROUTE: ', mk.toUpperCase() + ' ' + pk);
+
+      if (process.env.debug) {
+        console.log('ADDING ROUTE: ', mk.toUpperCase() + ' ' + pk);
+      }
 
       let respond = generateResponse(method.responses, pk);
       router.addRoute('/' + mk + route, respond);

diff --git a/src/index.js b/src/index.js
@@ -42,11 +42,14 @@ module.exports = function(config) {
         path = '/' + path;
       }
 
-      console.log('Request: %s %s', req.method, path);
       const matchingRoute = router.match('/' + method + path);
 
       if (!matchingRoute) return next();
 
+      if (process.env.debug) {
+        console.log('Request: %s %s', req.method, path);
+      }
+
       try {
         const response = matchingRoute.fn();
         res.setHeader('Content-Type', 'application/json');