File tree Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change 78
78
"mongodb-connection-model" : " ^3.0.6" ,
79
79
"mongodb-instance-model" : " ^1.0.2" ,
80
80
"mongodb-ns" : " ^1.0.0" ,
81
+ "ms" : " ^0.7.1" ,
81
82
"node-notifier" : " ^4.3.1" ,
82
- "scout-server" : " http://bin.mongodb.org/js/scout-server/v0.4.5 /scout-server-0.4.5 .tar.gz"
83
+ "scout-server" : " http://bin.mongodb.org/js/scout-server/v0.4.6 /scout-server-0.4.6 .tar.gz"
83
84
},
84
85
"devDependencies" : {
85
86
"ampersand-app" : " ^1.0.4" ,
Original file line number Diff line number Diff line change
1
+ var ms = require ( 'ms' ) ;
1
2
var Model = require ( 'ampersand-model' ) ;
2
3
var EJSON = require ( 'mongodb-extended-json' ) ;
3
4
var Query = require ( 'mongodb-language-model' ) . Query ;
@@ -8,6 +9,7 @@ var DEFAULT_SORT = {
8
9
} ;
9
10
var DEFAULT_SIZE = 100 ;
10
11
var DEFAULT_SKIP = 0 ;
12
+ var DEFAULT_MAX_TIME_MS = ms ( '10 seconds' ) ;
11
13
12
14
var getDefaultQuery = function ( ) {
13
15
return new Query ( { } , {
@@ -39,6 +41,10 @@ module.exports = Model.extend({
39
41
skip : {
40
42
type : 'number' ,
41
43
default : DEFAULT_SKIP
44
+ } ,
45
+ maxTimeMS : {
46
+ type : 'number' ,
47
+ default : DEFAULT_MAX_TIME_MS
42
48
}
43
49
} ,
44
50
derived : {
@@ -60,7 +66,8 @@ module.exports = Model.extend({
60
66
query : getDefaultQuery ( ) ,
61
67
sort : DEFAULT_SORT ,
62
68
size : DEFAULT_SIZE ,
63
- skip : DEFAULT_SKIP
69
+ skip : DEFAULT_SKIP ,
70
+ maxTimeMS : DEFAULT_MAX_TIME_MS
64
71
} ) ;
65
72
this . trigger ( 'reset' , this ) ;
66
73
}
You can’t perform that action at this time.
0 commit comments