diff --git a/server.go b/server.go index 59b6825..507ac8f 100644 --- a/server.go +++ b/server.go @@ -2,11 +2,12 @@ package main import ( "net/http" - - "mywebsite/server/controller/api" - "mywebsite/server/db" - "mywebsite/server/route" - "mywebsite/server/utils" + + //local import paths relative to app.yaml file + "server/controller/api" + "server/db" + "server/route" + "server/utils" ) func init() { diff --git a/server/controller/api/sensor.go b/server/controller/api/sensor.go index 5dd87be..550806a 100644 --- a/server/controller/api/sensor.go +++ b/server/controller/api/sensor.go @@ -9,8 +9,8 @@ import ( "strconv" "time" - "mywebsite/server/model/daily_sensor" - "mywebsite/server/model/raw_sensor" + "server/model/daily_sensor" + "server/model/raw_sensor" ) // handle http request from sensors diff --git a/server/db/db.go b/server/db/db.go index c5c877b..57c162a 100644 --- a/server/db/db.go +++ b/server/db/db.go @@ -25,25 +25,29 @@ func Configure(d DatabaseInfo) { } func (d *Driver) Connect() { - // Connect to MongoDB - s, err := mgo.DialWithTimeout(d.Info.URL, 5*time.Second) - - if err != nil { - log.Println("MongoDB Driver Error", err) - return + if (d.Info.URL != ""){ + // Connect to MongoDB + s, err := mgo.DialWithTimeout(d.Info.URL, 5*time.Second) + + if err != nil { + log.Println("MongoDB Driver Error", err) + return + } + + d.Session = s + + // Prevents these errors: read tcp 127.0.0.1:27017: i/o timeout + d.Session.SetSocketTimeout(10 * time.Second) + + // Check if is alive + if err = d.Session.Ping(); err != nil { + log.Println("Database Error", err) + } + + log.Println("Connected to database") + } else { + log.Println("Database not configured") } - - d.Session = s - - // Prevents these errors: read tcp 127.0.0.1:27017: i/o timeout - d.Session.SetSocketTimeout(10 * time.Second) - - // Check if is alive - if err = d.Session.Ping(); err != nil { - log.Println("Database Error", err) - } - - log.Println("Connected to database") } func (d *Driver) Connected() bool { diff --git a/server/model/daily_sensor/daily_sensor.go b/server/model/daily_sensor/daily_sensor.go index 99837bb..4d1c29d 100644 --- a/server/model/daily_sensor/daily_sensor.go +++ b/server/model/daily_sensor/daily_sensor.go @@ -7,7 +7,7 @@ import ( "log" "time" - "mywebsite/server/db" + "server/db" ) const ( diff --git a/server/model/raw_sensor/raw_sensor.go b/server/model/raw_sensor/raw_sensor.go index c329a09..19a29df 100644 --- a/server/model/raw_sensor/raw_sensor.go +++ b/server/model/raw_sensor/raw_sensor.go @@ -7,7 +7,7 @@ import ( "log" "time" - "mywebsite/server/db" + "server/db" ) const ( diff --git a/server/route/route.go b/server/route/route.go index 8d7b9a6..632d297 100644 --- a/server/route/route.go +++ b/server/route/route.go @@ -5,8 +5,8 @@ import ( "log" "net/http" - "mywebsite/server/controller" - "mywebsite/server/controller/api" + "server/controller" + "server/controller/api" ) func Routes() *httprouter.Router { diff --git a/server/utils/config.go b/server/utils/config.go index 1e7e22d..25c26f3 100644 --- a/server/utils/config.go +++ b/server/utils/config.go @@ -6,8 +6,8 @@ import ( "log" "os" - "mywebsite/server/controller/api" - "mywebsite/server/db" + "server/controller/api" + "server/db" ) //structure for application configurations