Commit e78b62d0 by source_reader

backend fix for joule and regression for bcrypt library

parent 8e1682b6
Showing with 8 additions and 6 deletions
...@@ -50,7 +50,7 @@ GEM ...@@ -50,7 +50,7 @@ GEM
arel (9.0.0) arel (9.0.0)
ast (2.4.0) ast (2.4.0)
backports (3.11.4) backports (3.11.4)
bcrypt (3.1.13) bcrypt (3.1.12)
bindex (0.5.0) bindex (0.5.0)
bootsnap (1.3.2) bootsnap (1.3.2)
msgpack (~> 1.0) msgpack (~> 1.0)
......
...@@ -142,12 +142,13 @@ module Joule ...@@ -142,12 +142,13 @@ module Joule
attrs = { name: db_stream.name, attrs = { name: db_stream.name,
description: db_stream.description, description: db_stream.description,
elements: elements elements: elements
}.to_json }
begin begin
response = self.class.put("#{@url}/stream.json", response = self.class.put("#{@url}/stream.json",
body: { headers: { 'Content-Type' => 'application/json' },
body: {
id: db_stream.joule_id, id: db_stream.joule_id,
stream: attrs}) stream: attrs}.to_json)
rescue rescue
return { error: true, msg: 'cannot contact Joule server' } return { error: true, msg: 'cannot contact Joule server' }
end end
...@@ -159,12 +160,13 @@ module Joule ...@@ -159,12 +160,13 @@ module Joule
def update_folder(db_folder) def update_folder(db_folder)
attrs = { name: db_folder.name, attrs = { name: db_folder.name,
description: db_folder.description}.to_json description: db_folder.description}
begin begin
response = self.class.put("#{@url}/folder.json", response = self.class.put("#{@url}/folder.json",
headers: { 'Content-Type' => 'application/json' },
body: { body: {
id: db_folder.joule_id, id: db_folder.joule_id,
folder: attrs}) folder: attrs}.to_json)
rescue rescue
return { error: true, msg: 'cannot contact Joule server' } return { error: true, msg: 'cannot contact Joule server' }
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment