Browse Source

gitignore, added port option, tiny fixes

master
mortie 8 years ago
parent
commit
c605553698
3 changed files with 5 additions and 6 deletions
  1. 1
    1
      .gitignore
  2. 2
    1
      conf.json.example
  3. 2
    4
      server.js

+ 1
- 1
.gitignore View File

@@ -1 +1 @@
client/pic
conf.json

+ 2
- 1
conf.json.example View File

@@ -1,4 +1,5 @@
{
"slides": "slides",
"interval": 5000
"interval": 5000,
"port": 8080
}

+ 2
- 4
server.js View File

@@ -9,7 +9,7 @@ var conf = JSON.parse(fs.readFileSync("conf.json"));

function error(res, err) {
console.trace(err);
console.log(res.toString());
res.end(err.toString());
}

// The individual slide
@@ -24,7 +24,6 @@ function Slide(dir) {
.on("error", err => error(res, err))
.pipe(res);
} else {
console.log("loading "+parts.pathname+" from "+dir);
fs.createReadStream(pathlib.join(dir, parts.pathname))
.on("error", err => error(res, err))
.pipe(res);
@@ -54,7 +53,6 @@ function Slideshow(dir, changeInterval) {
var awaiters = [];

self.serve = function(req, res) {
console.log(currentSlide ? currentSlide.dir : "");
var parts = urllib.parse(req.url);

// /: Send the base site to the client
@@ -109,4 +107,4 @@ var slideshow = Slideshow(conf.slides, conf.interval);

http.createServer((req, res) => {
slideshow.serve(req, res);
}).listen(8080);
}).listen(conf.port);

Loading…
Cancel
Save