Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
wattsworth
/
lumen-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e78b62d0
authored
Jul 25, 2019
by
source_reader
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
backend fix for joule and regression for bcrypt library
parent
8e1682b6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
Gemfile.lock
app/adapters/joule/backend.rb
Gemfile.lock
View file @
e78b62d0
...
@@ -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.1
3
)
bcrypt (3.1.1
2
)
bindex (0.5.0)
bindex (0.5.0)
bootsnap (1.3.2)
bootsnap (1.3.2)
msgpack (~> 1.0)
msgpack (~> 1.0)
...
...
app/adapters/joule/backend.rb
View file @
e78b62d0
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment