ppetru/opensprinkler-weather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebase on latest master

Browse Source 
Revert refactor versioning

Tidy revert of versioning

Bump version
This commit is contained in:
Pete ba
2019-05-05 22:18:41 +01:00
parent e28c858eff
commit ca21058977
5 changed files with 106 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server.js
View File

@@ -1,14 +1,17 @@
var express = require( "express" ),
weather = require( "./routes/weather.js" ),
local = require( "./routes/local.js" ),
cors = require( "cors" ),
host = process.env.HOST || "127.0.0.1",
port = process.env.PORT || 3000,
pws = process.env.PWS || "none",
app = express();
if ( !process.env.HOST || !process.env.PORT ) {
if ( !process.env.HOST || !process.env.PORT || !process.env.LOCAL_PWS ) {
require( "dotenv" ).load();
host = process.env.HOST || host;
port = process.env.PORT || port;
pws = process.env.PWS || pws;
}
// Handle requests matching /weatherID.py where ID corresponds to the
@@ -21,6 +24,11 @@ app.get( /(\d+)/, weather.getWateringData );
app.options( /weatherData/, cors() );
app.get( /weatherData/, cors(), weather.getWeatherData );
// Endpoint to stream Weather Underground data from local PWS
if ( pws === "WU" ) {
app.get( "/weatherstation/updateweatherstation.php", local.captureWUStream );
}
app.get( "/", function( req, res ) {
res.send( "OpenSprinkler Weather Service" );
} );
@@ -34,6 +42,11 @@ app.use( function( req, res ) {
// Start listening on the service port
app.listen( port, host, function() {
console.log( "OpenSprinkler Weather Service now listening on %s:%s", host, port );
if (pws !== "none" ) {
console.log( "OpenSprinkler Weather Service now listening for local weather stream" );
}
} );
exports.app = app;
exports.pws = pws;