match is_app for joule api and increase timeout for slow nodes

.gitignore

@@ -25,4 +25,5 @@ vendor/bundle
 vagrant_boxes/*.log
 vagrant_boxes/*.log
 vagrant_boxes/.vagrant
 vagrant_boxes/.vagrant
 coverage
 coverage
-.idea
+.idea
\ No newline at end of file
+.DS_Store

app/adapters/joule/update_modules.rb

@@ -30,7 +30,7 @@ module Joule
       # hash returned by the JouleAdapter.module_info
       # hash returned by the JouleAdapter.module_info
       attrs = schema.slice(*JouleModule.defined_attributes)
       attrs = schema.slice(*JouleModule.defined_attributes)
       attrs[:pid] = schema[:statistics][:pid]
       attrs[:pid] = schema[:statistics][:pid]
-      attrs[:web_interface] = schema[:has_interface]
+      attrs[:web_interface] = schema[:is_app]
       attrs[:joule_id] = "m#{schema[:id]}"
       attrs[:joule_id] = "m#{schema[:id]}"
       m = JouleModule.create(attrs)
       m = JouleModule.create(attrs)
       # link inputs to database streams
       # link inputs to database streams

app/adapters/nilmdb/backend.rb

@@ -5,7 +5,7 @@ module Nilmdb
     include HTTParty
     include HTTParty
     default_timeout 5
     default_timeout 5
     open_timeout 5
     open_timeout 5
-    read_timeout 5
+    read_timeout 10
 
 
     attr_reader :url
     attr_reader :url