fix bugs.

fix mongo engine.go set job info bug.
avoid job attribute coverage, only set some of the necessary fields.
set: stat, execerr, execat, nextat.

Author: bobliu0909

api/handler.go

@@ -158,6 +158,7 @@ func postLogs(c *Context) error {
 				ContactInfo: []string{notifyOpt.To},
 				JobResult: notify.JobResult{
 					JobName:    job.Name,
+					Directory:  request.JobLog.WorkDir,
 					Location:   job.Location,
 					Server:     request.JobLog.IpAddr,
 					Execat:     execAt,
@@ -169,7 +170,7 @@ func postLogs(c *Context) error {
 				},
 			}
 			notifySender := c.Get("NotifySender").(*notify.NotifySender)
-			notifySender.AddJobNotifyEvent("job notify.", watchJobNotify)
+			notifySender.AddJobNotifyEvent("This Job Has Been Executed.", watchJobNotify)
 		}
 	}
 	response.SetContent(ErrRequestAccepted.Error())

cache/cache.go

@@ -408,21 +408,6 @@ func (cacheRepository *CacheRepository) SetJobAction(location string, jobid stri
 	}
 }
 
-//SetJobNextAt is exported
-func (cacheRepository *CacheRepository) SetJobNextAt(jobid string, nextat time.Time) {
-
-	logger.INFO("[#cache#] set job nextat, %s %s", jobid, nextat)
-	job := cacheRepository.GetJob(jobid)
-	if job != nil {
-		if len(job.Schedule) > 0 {
-			job.Stat = models.STATE_STOPED
-			job.NextAt = nextat
-			logger.INFO("[#cache#] set job %s nextat to %s, execat %s, state %d", jobid, job.NextAt, job.ExecAt, job.Stat)
-			cacheRepository.storageDriver.SetJob(job)
-		}
-	}
-}
-
 //SetJobState is exported
 func (cacheRepository *CacheRepository) SetJobState(jobid string, state int) {
 
@@ -438,11 +423,19 @@ func (cacheRepository *CacheRepository) SetJobState(jobid string, state int) {
 	}
 }
 
-//SetJobLog is exported
-func (cacheRepository *CacheRepository) SetJobLog(joblog *models.JobLog) {
+//SetJobNextAt is exported
+func (cacheRepository *CacheRepository) SetJobNextAt(jobid string, nextat time.Time) {
 
-	logger.INFO("[#cache#] set job log, %s %d", joblog.JobId, joblog.Stat)
-	cacheRepository.storageDriver.SetJobLog(joblog)
+	logger.INFO("[#cache#] set job nextat, %s %s", jobid, nextat)
+	job := cacheRepository.GetJob(jobid)
+	if job != nil {
+		if len(job.Schedule) > 0 {
+			job.Stat = models.STATE_STOPED
+			job.NextAt = nextat
+			logger.INFO("[#cache#] set job %s nextat to %s, execat %s, state %d", jobid, job.NextAt, job.ExecAt, job.Stat)
+			cacheRepository.storageDriver.SetJob(job)
+		}
+	}
 }
 
 //SetJobExecute is exported
@@ -467,6 +460,13 @@ func (cacheRepository *CacheRepository) SetJobExecute(jobid string, state int, e
 	}
 }
 
+//SetJobLog is exported
+func (cacheRepository *CacheRepository) SetJobLog(joblog *models.JobLog) {
+
+	logger.INFO("[#cache#] set job log, %s %d", joblog.JobId, joblog.Stat)
+	cacheRepository.storageDriver.SetJobLog(joblog)
+}
+
 //GetWorker is exported
 func (cacheRepository *CacheRepository) GetWorker(key string) *Worker {
 

cache/driver/mongo/engine.go

@@ -251,7 +251,11 @@ func (engine *Engine) putJob(job *models.Job) error {
 	session := engine.getSession()
 	defer session.Close()
 	return session.DB(engine.DataBase).C(SYS_JOBS).
-		Update(M{"jobid": job.JobId}, job)
+		Update(M{"jobid": job.JobId}, M{"$set": M{
+			"stat":    job.Stat,
+			"execerr": job.ExecErr,
+			"execat":  job.ExecAt,
+			"nextat":  job.NextAt}})
 }
 
 func (engine *Engine) postJobLog(jobLog *models.JobLog) error {

etc/jobserver.yaml

@@ -26,7 +26,7 @@ cache:
         options: [
           "maxPoolSize=20",
           "replicaSet=mgoCluster",
-		  #"authSource=admin"
+		      #"authSource=admin"
         ]
 notifications:
     endpoints:

notify/templates/job.html

@@ -36,7 +36,7 @@
     <table width="800" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#b1ebff" style="padding: 0 10px; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #333;">
         <tr>
             <td colspan="2" style="padding:0 10px;">
-                <a href="task.newegg.org" target="_blank" style=" color: #17627c; text-decoration: none;">
+                <a href="#" target="_blank" style=" color: #17627c; text-decoration: none;">
                     <div>
                         <strong style="font-size: 40px; color: white; text-shadow: 3px 3px 3px gray; filter: dropshadow(color=#000000, offx=2, offy=2);">Cloud</strong>
                         <strong style="font-size: 60px; text-shadow: 3px 3px 3px gray; filter: dropshadow(color=#000000, offx=2, offy=2);">Task</strong>
@@ -66,6 +66,10 @@
             <td class="title"><strong>Job name</strong></td>
             <td class="content"><strong>{{.WatchJobNotify.JobName}}</strong></td>
         </tr>
+        <tr>
+            <td class="title"><strong>Directory</strong></td>
+            <td class="content"><strong>{{.WatchJobNotify.Directory}}</strong></td>
+        </tr>
         <tr>
             <td class="title"><strong>Location</strong></td>
             <td class="content"><strong>{{.WatchJobNotify.Location}}</strong></td>

notify/typedef.go

@@ -64,6 +64,7 @@ func (location *WatchLocation) AddContactInfo(value string) {
 //JobResult is exported
 type JobResult struct {
 	JobName    string
+	Directory  string
 	Location   string
 	Server     string
 	Execat     string