瀏覽代碼

More restructuring

Matt Coles 9 年之前
父節點
當前提交
c96435a474
共有 1 個文件被更改,包括 11 次插入8 次删除
  1. 11 8
      index.js

+ 11 - 8
index.js

@@ -8,10 +8,10 @@ var serveIndex = require('serve-index');
8 8
 var basic_auth = require('basic-auth');
9 9
 var FileStreamRotator = require('file-stream-rotator');
10 10
 var morgan = require('morgan');
11
-var logDirectory = 'log'
12 11
 var route_manager = require("../ip-project-server/utils/route-manager.js");
13 12
 var scheduler = require("../ip-project-server/presenters/schedule-controller.js");
14 13
 var app = express();
14
+var logDirectory = 'log'
15 15
 
16 16
 // Set up authentication and existing events.
17 17
 var log_passwd = fs.readFileSync('../ip-project-server/logpasswd', 'utf-8');
@@ -30,10 +30,20 @@ var auth = function (req, res, next) {
30 30
     return unauthorized(res);
31 31
   };
32 32
 };
33
+
34
+fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory)
35
+var accessLogStream = FileStreamRotator.getStream({
36
+  date_format: 'YYYYMMDD',
37
+  filename: logDirectory + '/access-%DATE%.log',
38
+  frequency: 'daily',
39
+  verbose: false
40
+})
41
+
33 42
 scheduler.register_existing_events();
34 43
 
35 44
 // Always use SSL, comes first.
36 45
 app.use(forceSSL);
46
+
37 47
 app.use(bodyParser.json()); // for parsing application/json
38 48
 app.use(bodyParser.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded
39 49
 
@@ -45,13 +55,6 @@ app.use('/soc-api/*', function(req, res, next) {
45 55
 });
46 56
 
47 57
 // Logging comes next
48
-fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory)
49
-var accessLogStream = FileStreamRotator.getStream({
50
-  date_format: 'YYYYMMDD',
51
-  filename: logDirectory + '/access-%DATE%.log',
52
-  frequency: 'daily',
53
-  verbose: false
54
-})
55 58
 app.use(morgan('short', {stream: accessLogStream}))
56 59
 app.use(morgan('short'));
57 60