← Back to branch summary

~gary/juju-gui/hideInspectorOnRelationClick

« back to all changes in this revision

Viewing changes to lib/server.js

Merged trunk, resolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/server.js
 
1
"use strict";
 
2
 
1
3
var express = require("express"),
2
4
    server = express(),
3
5
    fs = require("fs"),
4
6
    path = require("path"),
5
7
    config = require("../config").config.server,
6
 
    public_dir = config["public_dir"],
 
8
    public_dir = config.public_dir,
7
9
    Templates = require("./templates.js"),
8
10
    view = require("./view.js");
9
11
 
15
17
    server.engine("handlebars", view.handlebars);
16
18
 
17
19
    server.use(express.logger("dev"));
18
 
    server.use(express.static(public_dir));
 
20
    // 'static' is a reserved word so dot notation is not used to
 
21
    // avoid annoying the linter.
 
22
    server.use(express['static'](public_dir));
19
23
});
20
24
 
21
25
 
27
31
Templates.watchTemplates(function() {
28
32
    console.log("Regenerated Templates");
29
33
});
30
 
            
 
34
 
31
35
Templates.watchViews(function() {
32
36
    console.log("Regenerating Views");
33
37
});
37
41
 
38
42
server.get('/stats/', function(req, res) {
39
43
    res.json({
40
 
        uptime: process.uptime(),
41
 
        memory: process.memoryUsage()
 
44
        uptime: process.uptime(),
 
45
        memory: process.memoryUsage()
42
46
    });
43
47
});
44
48
 
46
50
    res.sendfile("app/index.html");
47
51
});
48
52
 
49
 
exports.server = server;
 
 
b'\\ No newline at end of file'
 
53
exports.server = server;