Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
A
augustctl
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
open-source
augustctl
Commits
3b28a516
Verified
Commit
3b28a516
authored
Aug 29, 2016
by
Erick Hitter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Limit request duration so that requests blocked by Bluetooth actiivty don't sit unnecessarily.
parent
c19d3b4b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
package.json
package.json
+2
-1
server.js
server.js
+12
-2
No files found.
package.json
View file @
3b28a516
...
...
@@ -21,7 +21,8 @@
"
morgan
"
:
"
^1.6.1
"
,
"
noble
"
:
"
^1.1.0
"
,
"
asyncawait
"
:
"
^0.7.4
"
,
"
apicache
"
:
"
*
"
"
apicache
"
:
"
*
"
,
"
connect-timeout
"
:
"
*
"
},
"repository"
:
{
"type"
:
"git"
,
...
...
server.js
View file @
3b28a516
...
...
@@ -11,6 +11,7 @@ var await = require( 'asyncawait/await' );
var
async
=
require
(
'
asyncawait/async
'
);
var
apicache
=
require
(
'
apicache
'
).
options
(
{
defaultDuration
:
15000
}
);
var
cache
=
apicache
.
middleware
;
var
timeout
=
require
(
'
connect-timeout
'
);
var
config
=
require
(
process
.
env
.
AUGUSTCTL_CONFIG
||
'
./config.json
'
);
var
serverConfig
=
require
(
process
.
env
.
AUGUSTCTL_SERVER_CONFIG
||
'
./server-config.json
'
);
...
...
@@ -70,12 +71,21 @@ function clearCaches( lockName ) {
return
true
;
}
// Middleware to handle timeout status checks
function
haltOnTimedout
(
req
,
res
,
next
)
{
if
(
req
.
timedout
)
{
lock
.
disconnect
();
}
else
{
next
();
}
}
/**
* ROUTES
*/
// Endpoint to check lock status
app
.
get
(
'
/api/status/:lock_name
'
,
cache
(
'
5 seconds
'
)
,
function
(
req
,
res
)
{
app
.
get
(
'
/api/status/:lock_name
'
,
timeout
(
'
5 seconds
'
),
cache
(
'
5 seconds
'
),
haltOnTimedout
,
function
(
req
,
res
)
{
// Parse allowed request arguments
var
lock
=
getLockInstance
(
req
.
params
.
lock_name
,
res
);
if
(
!
lock
)
{
...
...
@@ -102,7 +112,7 @@ app.get( '/api/status/:lock_name', cache( '5 seconds' ), function( req, res ) {
}
);
// Endpoint to change lock state
app
.
get
(
'
/api/:lock_action(lock|unlock)/:lock_name
'
,
cache
(
'
3 seconds
'
)
,
function
(
req
,
res
)
{
app
.
get
(
'
/api/:lock_action(lock|unlock)/:lock_name
'
,
timeout
(
'
5 seconds
'
),
cache
(
'
3 seconds
'
),
haltOnTimedout
,
function
(
req
,
res
)
{
// Parse allowed request arguments
var
action
=
req
.
params
.
lock_action
,
allowedActions
=
[
'
unlock
'
,
'
lock
'
];
...
...
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