Skip to content

Commit 8a2223b

Browse files
committed
fix configs.
1 parent 4379871 commit 8a2223b

2 files changed

Lines changed: 23 additions & 14 deletions

File tree

cache/driver/mongo/engine.go

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,24 @@ import (
1212
)
1313

1414
const (
15+
//mongo connect maxPoolSize default value.
1516
defaultMaxPoolSize = 20
1617
)
1718

1819
const (
19-
SYS_LOCATIONNS = "sys_locations"
20-
SYS_JOBS = "sys_jobs"
21-
SYS_LOGS = "logs"
20+
//sysLocatinsCollection is exported, mongo sys_locations collection name define.
21+
sysLocatinsCollection = "sys_locations"
22+
//sysJobsCollection is exported, mongo sys_jobs collection name define.
23+
sysJobsCollection = "sys_jobs"
24+
//sysLogsCollection is exported, mongo logs collection name define.
25+
sysLogsCollection = "logs"
2226
)
2327

28+
//M is exported
29+
//mongo bson map type define.
2430
type M bson.M
2531

32+
//D is exported
2633
type D bson.D
2734

2835
//MgoConfigs is exported
@@ -152,7 +159,7 @@ func (engine *Engine) getLocation(location string) (*models.WorkLocation, error)
152159
session := engine.getSession()
153160
defer session.Close()
154161
workLocation := &models.WorkLocation{}
155-
if err := session.DB(engine.DataBase).C(SYS_LOCATIONNS).
162+
if err := session.DB(engine.DataBase).C(sysLocatinsCollection).
156163
Find(M{"location": location}).
157164
Select(M{"_id": 0}).One(workLocation); err != nil {
158165
if err == mgo.ErrNotFound {
@@ -167,15 +174,15 @@ func (engine *Engine) postLocation(workLocation *models.WorkLocation) error {
167174

168175
session := engine.getSession()
169176
defer session.Close()
170-
return session.DB(engine.DataBase).C(SYS_LOCATIONNS).
177+
return session.DB(engine.DataBase).C(sysLocatinsCollection).
171178
Insert(workLocation)
172179
}
173180

174181
func (engine *Engine) putLocation(workLocation *models.WorkLocation) error {
175182

176183
session := engine.getSession()
177184
defer session.Close()
178-
return session.DB(engine.DataBase).C(SYS_LOCATIONNS).
185+
return session.DB(engine.DataBase).C(sysLocatinsCollection).
179186
Update(M{"location": workLocation.Location}, workLocation)
180187
}
181188

@@ -184,7 +191,7 @@ func (engine *Engine) readLocationsName() ([]string, error) {
184191
session := engine.getSession()
185192
defer session.Close()
186193
workLocations := []*models.WorkLocation{}
187-
if err := session.DB(engine.DataBase).C(SYS_LOCATIONNS).
194+
if err := session.DB(engine.DataBase).C(sysLocatinsCollection).
188195
Find(M{}).
189196
Select(M{"_id": 0, "location": 1}).
190197
All(&workLocations); err != nil {
@@ -203,7 +210,7 @@ func (engine *Engine) readSimpleJobs(query M) ([]*models.SimpleJob, error) {
203210
session := engine.getSession()
204211
defer session.Close()
205212
jobs := []*models.SimpleJob{}
206-
if err := session.DB(engine.DataBase).C(SYS_JOBS).
213+
if err := session.DB(engine.DataBase).C(sysJobsCollection).
207214
Find(query).
208215
Select(M{"_id": 0, "jobid": 1, "name": 1, "location": 1, "groupid": 1, "servers": 1, "enabled": 1, "stat": 1}).
209216
All(&jobs); err != nil {
@@ -217,7 +224,7 @@ func (engine *Engine) readJobs(query M) ([]*models.Job, error) {
217224
session := engine.getSession()
218225
defer session.Close()
219226
jobs := []*models.Job{}
220-
if err := session.DB(engine.DataBase).C(SYS_JOBS).
227+
if err := session.DB(engine.DataBase).C(sysJobsCollection).
221228
Find(query).
222229
Select(M{"_id": 0}).
223230
All(&jobs); err != nil {
@@ -249,7 +256,7 @@ func (engine *Engine) getJob(jobid string) (*models.Job, error) {
249256
session := engine.getSession()
250257
defer session.Close()
251258
job := &models.Job{}
252-
if err := session.DB(engine.DataBase).C(SYS_JOBS).
259+
if err := session.DB(engine.DataBase).C(sysJobsCollection).
253260
Find(M{"jobid": jobid}).
254261
Select(M{"_id": 0}).One(job); err != nil {
255262
if err == mgo.ErrNotFound {
@@ -264,7 +271,7 @@ func (engine *Engine) putJob(job *models.Job) error {
264271

265272
session := engine.getSession()
266273
defer session.Close()
267-
return session.DB(engine.DataBase).C(SYS_JOBS).
274+
return session.DB(engine.DataBase).C(sysJobsCollection).
268275
Update(M{"jobid": job.JobId}, M{"$set": M{
269276
"stat": job.Stat,
270277
"execerr": job.ExecErr,
@@ -276,7 +283,7 @@ func (engine *Engine) postJobLog(jobLog *models.JobLog) error {
276283

277284
session := engine.getSession()
278285
defer session.Close()
279-
return session.DB(engine.DataBase).C(SYS_LOGS).
286+
return session.DB(engine.DataBase).C(sysLogsCollection).
280287
Insert(jobLog)
281288
}
282289

cache/driver/mongo/mongo.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ import (
1111
)
1212

1313
var (
14-
ErrMongoStorageDriverHostsInvalid = errors.New("mongo storage driver hosts invalid.")
15-
ErrMongoStorageDriverDataBaseInvalid = errors.New("mongo storage driver database invalid.")
14+
//ErrMongoStorageDriverHostsInvalid is exported, parameters map not has 'hosts' key error.
15+
ErrMongoStorageDriverHostsInvalid = errors.New("mongo storage driver hosts invalid")
16+
//ErrMongoStorageDriverDataBaseInvalid is exported, parameters map not has 'database' key error.
17+
ErrMongoStorageDriverDataBaseInvalid = errors.New("mongo storage driver database invalid")
1618
)
1719

1820
//MongoStorageDriver is exported

0 commit comments

Comments
 (0)