diff --git a/controllers/task.go b/controllers/task.go index d8f6c5e..900de18 100644 --- a/controllers/task.go +++ b/controllers/task.go @@ -16,9 +16,6 @@ import ( "strconv" "strings" "time" - "os/exec" - "log" - "os" ) type TaskController struct { @@ -46,9 +43,6 @@ func (this *TaskController) List() { row["cron_spec"] = v.CronSpec row["status"] = v.Status row["description"] = v.Description - - row["task_type"] = v.TaskType - e := jobs.GetEntryById(v.Id) if e != nil { row["next_time"] = beego.Date(e.Next, "Y-m-d H:i:s") @@ -90,8 +84,6 @@ func (this *TaskController) Add() { task.UserId = this.userId task.GroupId, _ = this.GetInt("group_id") task.TaskName = strings.TrimSpace(this.GetString("task_name")) - task.TaskTag = strings.TrimSpace(this.GetString("task_tag")) - task.TaskType, _ = this.GetInt("task_type") task.Description = strings.TrimSpace(this.GetString("description")) task.Concurrent, _ = this.GetInt("concurrent") task.CronSpec = strings.TrimSpace(this.GetString("cron_spec")) @@ -99,7 +91,6 @@ func (this *TaskController) Add() { task.Notify, _ = this.GetInt("notify") task.Timeout, _ = this.GetInt("timeout") - notifyEmail := strings.TrimSpace(this.GetString("notify_email")) if notifyEmail != "" { emailList := make([]string, 0) @@ -146,8 +137,6 @@ func (this *TaskController) Edit() { if this.isPost() { task.TaskName = strings.TrimSpace(this.GetString("task_name")) - task.TaskTag = strings.TrimSpace(this.GetString("task_tag")) - task.TaskType, _ = this.GetInt("task_type") task.Description = strings.TrimSpace(this.GetString("description")) task.GroupId, _ = this.GetInt("group_id") task.Concurrent, _ = this.GetInt("concurrent") @@ -304,9 +293,6 @@ func (this *TaskController) Batch() { if task, err := models.TaskGetById(id); err == nil { task.Status = 0 task.Update() - if task.TaskType==1 { - stopProcess(task.TaskTag)//杀死进程 - } } case "delete": @@ -358,10 +344,6 @@ func (this *TaskController) Pause() { task.Status = 0 task.Update() - //如果是常驻进程，kill - if task.TaskType==1 { - stopProcess(task.TaskTag) - } refer := this.Ctx.Request.Referer() if refer == "" { refer = beego.URLFor("TaskController.List") @@ -385,11 +367,3 @@ func (this *TaskController) Run() { job.Run() this.redirect(beego.URLFor("TaskController.ViewLog", "id", job.GetLogId())) } -//杀死进程 -func stopProcess(taskTag string) { - ppPath,_ := os.Getwd() //项目根目录 - shellFile := ppPath+"/kill_process.sh " - cmd:= exec.Command("sh","-c", shellFile + taskTag) - out,err:=cmd.Output() - log.Printf("==========================out:%s err:%s",out,err) -} diff --git a/jobs/init.go b/jobs/init.go index 4024cd6..348bc03 100644 --- a/jobs/init.go +++ b/jobs/init.go @@ -49,24 +49,3 @@ func runCmdWithTimeout(cmd *exec.Cmd, timeout time.Duration) (error, bool) { } } -//func stopCmd(cmd *exec.Cmd) (error,bool) { -// done := make(chan error) -// go func() { -// done <- cmd.Wait() -// }() -// -// var err error -// select { -// case <-time.After(timeout): -// beego.Warn(fmt.Sprintf("任务执行时间超过%d秒，进程将被强制杀掉: %d", int(timeout/time.Second), cmd.Process.Pid)) -// go func() { -// <-done // 读出上面的goroutine数据，避免阻塞导致无法退出 -// }() -// if err = cmd.Process.Kill(); err != nil { -// beego.Error(fmt.Sprintf("进程无法杀掉: %d, 错误信息: %s", cmd.Process.Pid, err)) -// } -// return err, true -// case err = <-done: -// return err, false -// } -//} diff --git a/jobs/job.go b/jobs/job.go index 00f402b..7cdd5de 100644 --- a/jobs/job.go +++ b/jobs/job.go @@ -133,13 +133,7 @@ func (j *Job) Run() { if j.task.Timeout > 0 { timeout = time.Second * time.Duration(j.task.Timeout) } - cmdOut, cmdErr, err, isTimeout := j.runFunc(timeout) - if err.Error() == "signal: killed" { - cmdOut += err.Error() - err = nil - } - ut := time.Now().Sub(t) / time.Millisecond // 插入日志 diff --git a/kill_process.sh b/kill_process.sh deleted file mode 100755 index 4610ae0..0000000 --- a/kill_process.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# @Author: haodaquan -# @Date: 2017-06-29 17:44:45 -# @Last Modified by: haodaquan -# @Last Modified time: 2017-06-29 17:44:45 - -process_tag=$1 -arrproc=$(ps -ef | grep "${process_tag}" | grep -v grep | awk '{print $2}') -for p in $arrproc; do - if [ "${p}"=~^[0-9]+$ ]; then - kill -9 "${p}" - echo `date "+%Y/%m/%d %H:%M:%S> "` ${p} " 进程已杀死！" - fi -done \ No newline at end of file diff --git a/models/task.go b/models/task.go index b56e343..a585be5 100644 --- a/models/task.go +++ b/models/task.go @@ -25,7 +25,6 @@ type Task struct { GroupId int TaskName string TaskType int - TaskTag string Description string CronSpec string Concurrent int @@ -55,9 +54,6 @@ func TaskAdd(task *Task) (int64, error) { return 0, fmt.Errorf("TaskName字段不能为空") } - if task.TaskTag == "" { - return 0, fmt.Errorf("TaskTag字段不能为空") - } if task.CronSpec == "" { return 0, fmt.Errorf("CronSpec字段不能为空") } diff --git a/ppgo_job.sql b/ppgo_job.sql index 9913741..9f6f823 100644 --- a/ppgo_job.sql +++ b/ppgo_job.sql @@ -9,7 +9,7 @@ Target Server Version : 50712 File Encoding : utf-8 - Date: 06/30/2017 16:48:34 PM + Date: 07/03/2017 17:02:41 PM */ SET NAMES utf8; @@ -48,7 +48,6 @@ CREATE TABLE `pp_task` ( `user_id` int(11) NOT NULL DEFAULT '0' COMMENT '用户ID', `group_id` int(11) NOT NULL DEFAULT '0' COMMENT '分组ID', `task_name` varchar(50) NOT NULL DEFAULT '' COMMENT '任务名称', - `task_tag` varchar(200) NOT NULL COMMENT '任务标志，用于查找进程', `task_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '任务类型:1-常驻类型，0-定时类型', `description` varchar(200) NOT NULL DEFAULT '' COMMENT '任务描述', `cron_spec` varchar(100) NOT NULL DEFAULT '' COMMENT '时间表达式', @@ -64,13 +63,13 @@ CREATE TABLE `pp_task` ( PRIMARY KEY (`id`), KEY `idx_user_id` (`user_id`), KEY `idx_group_id` (`group_id`) -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; -- ---------------------------- -- Records of `pp_task` -- ---------------------------- BEGIN; -INSERT INTO `pp_task` VALUES ('1', '1', '1', '测试任务', '', '0', '测试任务说明', '0 0/1 11 * *', '0', 'echo \"hello\\n\" >> /tmp/test_cron1.log', '0', '0', '', '0', '46', '1498187640', '1497855526'), ('2', '1', '1', '测试任务23', '', '0', '这是测试任务3', '*/5 * * * *', '0', 'echo \"hello22\" >> /tmp/test.log', '0', '1', 'sdf@11.com', '2', '14', '1498554870', '1498034382'), ('3', '1', '2', '测试php', 'test_cron', '1', '五秒中一次', '*/5 * * * *', '0', '/usr/local/php/bin/php /Users/haodaquan/Sites/WorkList/xiyou_channel/index.php /tmall_abroad/task test_cron', '0', '0', '', '0', '143', '1498808295', '1498541334'), ('4', '1', '1', '定时获取订单2', 'php-ce11', '1', '每五秒执行一次22', '*/5 * * * *', '0', 'echo \"test\" >> /tmp/test.log', '0', '0', '', '0', '15', '1498728615', '1498723369'); +INSERT INTO `pp_task` VALUES ('1', '1', '1', '测试任务', '0', '测试任务说明', '0 0/1 11 * *', '0', 'echo \"hello\\n\" >> /tmp/test_cron1.log', '0', '0', '', '0', '46', '1498187640', '1497855526'), ('2', '1', '1', '测试任务23', '0', '这是测试任务3', '*/5 * * * *', '0', 'echo \"hello22\" >> /tmp/test.log', '0', '1', 'sdf@11.com', '2', '14', '1498554870', '1498034382'), ('3', '1', '2', '测试php', '1', '五秒中一次', '*/5 * * * *', '0', '/usr/local/php/bin/php /Users/haodaquan/Sites/WorkList/xiyou_channel/index.php /tmall_abroad/task test_cron', '0', '0', '', '0', '143', '1498808295', '1498541334'), ('4', '1', '1', '定时获取订单2', '1', '每五秒执行一次22', '*/5 * * * *', '0', 'echo \"test\" >> /tmp/test.log', '0', '0', '', '0', '15', '1498728615', '1498723369'), ('5', '1', '2', 'ceshi', '0', '每天一次1', '0 */5 * * *', '0', 'echo \"test\" >> /tmp/test.log', '0', '0', '', '0', '1', '1499072538', '1499072512'); COMMIT; -- ---------------------------- @@ -108,13 +107,13 @@ CREATE TABLE `pp_task_log` ( `create_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`), KEY `idx_task_id` (`task_id`,`create_time`) -) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8; -- ---------------------------- -- Records of `pp_task_log` -- ---------------------------- BEGIN; -INSERT INTO `pp_task_log` VALUES ('1', '3', '2017-06-30 10:45:31开始写入日志\n2017-06-30 10:45:32开始写入日志\n2017-06-30 10:45:33开始写入日志\n2017-06-30 10:45:34开始写入日志\n2017-06-30 10:45:35开始写入日志\n2017-06-30 10:45:36开始写入日志\n2017-06-30 10:45:37开始写入日志\n2017-06-30 10:45:38开始写入日志\n2017-06-30 10:45:39开始写入日志\n2017-06-30 10:45:40开始写入日志\n2017-06-30 10:45:41开始写入日志\n2017-06-30 10:45:42开始写入日志\n2017-06-30 10:45:43开始写入日志\n2017-06-30 10:45:44开始写入日志\n2017-06-30 10:45:45开始写入日志\n2017-06-30 10:45:46开始写入日志\n2017-06-30 10:45:47开始写入日志\n2017-06-30 10:45:48开始写入日志\n2017-06-30 10:45:49开始写入日志\n2017-06-30 10:45:50开始写入日志\n2017-06-30 10:45:51开始写入日志\n2017-06-30 10:45:52开始写入日志\n2017-06-30 10:45:53开始写入日志\n2017-06-30 10:45:54开始写入日志\n2017-06-30 10:45:55开始写入日志\n2017-06-30 10:45:56开始写入日志\n2017-06-30 10:45:57开始写入日志\n2017-06-30 10:45:58开始写入日志\n2017-06-30 10:45:59开始写入日志\n2017-06-30 10:46:00开始写入日志\n2017-06-30 10:46:01开始写入日志\n2017-06-30 10:46:02开始写入日志\n2017-06-30 10:46:03开始写入日志\n2017-06-30 10:46:04开始写入日志\n2017-06-30 10:46:05开始写入日志\n2017-06-30 10:46:06开始写入日志\n2017-06-30 10:46:07开始写入日志\n2017-06-30 10:46:08开始写入日志\n2017-06-30 10:46:09开始写入日志\n2017-06-30 10:46:10开始写入日志\n2017-06-30 10:46:11开始写入日志\n2017-06-30 10:46:12开始写入日志\n2017-06-30 10:46:13开始写入日志\n2017-06-30 10:46:14开始写入日志\n2017-06-30 10:46:15开始写入日志\n2017-06-30 10:46:16开始写入日志\n2017-06-30 10:46:17开始写入日志\n2017-06-30 10:46:18开始写入日志\n2017-06-30 10:46:19开始写入日志\n2017-06-30 10:46:20开始写入日志\n2017-06-30 10:46:21开始写入日志\n2017-06-30 10:46:22开始写入日志\n2017-06-30 10:46:23开始写入日志\n2017-06-30 10:46:24开始写入日志\n2017-06-30 10:46:25开始写入日志\n2017-06-30 10:46:26开始写入日志\n2017-06-30 10:46:27开始写入日志\n2017-06-30 10:46:28开始写入日志\n2017-06-30 10:46:29开始写入日志\n2017-06-30 10:46:30开始写入日志\n2017-06-30 10:46:31开始写入日志\n2017-06-30 10:46:32开始写入日志\n2017-06-30 10:46:33开始写入日志\n2017-06-30 10:46:34开始写入日志\n2017-06-30 10:46:35开始写入日志\n2017-06-30 10:46:36开始写入日志\n2017-06-30 10:46:37开始写入日志\n2017-06-30 10:46:38开始写入日志\n2017-06-30 10:46:39开始写入日志\n2017-06-30 10:46:40开始写入日志\n2017-06-30 10:46:41开始写入日志\n2017-06-30 10:46:42开始写入日志\n2017-06-30 10:46:43开始写入日志\n2017-06-30 10:46:44开始写入日志\n2017-06-30 10:46:45开始写入日志\n2017-06-30 10:46:46开始写入日志\n2017-06-30 10:46:47开始写入日志\n2017-06-30 10:46:48开始写入日志\n2017-06-30 10:46:49开始写入日志\n2017-06-30 10:46:50开始写入日志\n2017-06-30 10:46:51开始写入日志\n2017-06-30 10:46:52开始写入日志\n2017-06-30 10:46:53开始写入日志\n2017-06-30 10:46:54开始写入日志\n2017-06-30 10:46:55开始写入日志\n2017-06-30 10:46:56开始写入日志\n2017-06-30 10:46:57开始写入日志\n2017-06-30 10:46:58开始写入日志\n2017-06-30 10:46:59开始写入日志\n2017-06-30 10:47:00开始写入日志\n2017-06-30 10:47:01开始写入日志\n2017-06-30 10:47:02开始写入日志\n2017-06-30 10:47:03开始写入日志\n2017-06-30 10:47:04开始写入日志\n2017-06-30 10:47:05开始写入日志\n2017-06-30 10:47:06开始写入日志\n2017-06-30 10:47:07开始写入日志\n2017-06-30 10:47:08开始写入日志\n2017-06-30 10:47:09开始写入日志\n2017-06-30 10:47:10开始写入日志\n2017-06-30 10:47:11开始写入日志\n2017-06-30 10:47:12开始写入日志\n2017-06-30 10:47:13开始写入日志\n2017-06-30 10:47:14开始写入日志\n2017-06-30 10:47:15开始写入日志\n2017-06-30 10:47:16开始写入日志\n2017-06-30 10:47:17开始写入日志\n2017-06-30 10:47:18开始写入日志\n2017-06-30 10:47:19开始写入日志\n2017-06-30 10:47:20开始写入日志\n2017-06-30 10:47:21开始写入日志\n2017-06-30 10:47:22开始写入日志\n2017-06-30 10:47:23开始写入日志\n2017-06-30 10:47:24开始写入日志\n2017-06-30 10:47:25开始写入日志\n2017-06-30 10:47:26开始写入日志\n2017-06-30 10:47:27开始写入日志\n2017-06-30 10:47:28开始写入日志\n2017-06-30 10:47:29开始写入日志\n2017-06-30 10:47:30开始写入日志\n2017-06-30 10:47:31开始写入日志\n2017-06-30 10:47:32开始写入日志\n2017-06-30 10:47:33开始写入日志\n2017-06-30 10:47:34开始写入日志\n2017-06-30 10:47:35开始写入日志\n2017-06-30 10:47:36开始写入日志\n2017-06-30 10:47:37开始写入日志\n2017-06-30 10:47:38开始写入日志\n2017-06-30 10:47:39开始写入日志\n2017-06-30 10:47:40开始写入日志\n2017-06-30 10:47:41开始写入日志\n2017-06-30 10:47:42开始写入日志\n2017-06-30 10:47:43开始写入日志\n2017-06-30 10:47:44开始写入日志\n2017-06-30 10:47:45开始写入日志\n2017-06-30 10:47:46开始写入日志\n2017-06-30 10:47:47开始写入日志\n2017-06-30 10:47:48开始写入日志\n2017-06-30 10:47:49开始写入日志\n2017-06-30 10:47:50开始写入日志\n2017-06-30 10:47:51开始写入日志\n2017-06-30 10:47:52开始写入日志\n2017-06-30 10:47:53开始写入日志\n2017-06-30 10:47:54开始写入日志\n2017-06-30 10:47:55开始写入日志\n2017-06-30 10:47:56开始写入日志\n2017-06-30 10:47:57开始写入日志\n2017-06-30 10:47:58开始写入日志\n2017-06-30 10:47:59开始写入日志\n2017-06-30 10:48:00开始写入日志\n2017-06-30 10:48:01开始写入日志\n2017-06-30 10:48:02开始写入日志\n2017-06-30 10:48:03开始写入日志\n2017-06-30 10:48:04开始写入日志\n2017-06-30 10:48:05开始写入日志\n2017-06-30 10:48:06开始写入日志\n2017-06-30 10:48:07开始写入日志\n2017-06-30 10:48:08开始写入日志\n2017-06-30 10:48:09开始写入日志\n2017-06-30 10:48:10开始写入日志\n2017-06-30 10:48:11开始写入日志\n2017-06-30 10:48:12开始写入日志\n2017-06-30 10:48:13开始写入日志\n2017-06-30 10:48:14开始写入日志\n2017-06-30 10:48:15开始写入日志\n2017-06-30 10:48:16开始写入日志\n2017-06-30 10:48:17开始写入日志\n2017-06-30 10:48:18开始写入日志\n2017-06-30 10:48:19开始写入日志\n2017-06-30 10:48:20开始写入日志\n2017-06-30 10:48:21开始写入日志\n2017-06-30 10:48:22开始写入日志\n2017-06-30 10:48:23开始写入日志\n2017-06-30 10:48:24开始写入日志\n2017-06-30 10:48:25开始写入日志\n2017-06-30 10:48:26开始写入日志\n2017-06-30 10:48:27开始写入日志\n2017-06-30 10:48:28开始写入日志\n2017-06-30 10:48:29开始写入日志\n2017-06-30 10:48:30开始写入日志\n2017-06-30 10:48:31开始写入日志\n2017-06-30 10:48:32开始写入日志\n2017-06-30 10:48:33开始写入日志\n2017-06-30 10:48:34开始写入日志\n2017-06-30 10:48:35开始写入日志\n2017-06-30 10:48:36开始写入日志\n2017-06-30 10:48:37开始写入日志\n2017-06-30 10:48:38开始写入日志\n2017-06-30 10:48:39开始写入日志\n2017-06-30 10:48:40开始写入日志\n2017-06-30 10:48:41开始写入日志\n2017-06-30 10:48:42开始写入日志\n2017-06-30 10:48:43开始写入日志\n2017-06-30 10:48:44开始写入日志\n2017-06-30 10:48:45开始写入日志\n2017-06-30 10:48:46开始写入日志\n2017-06-30 10:48:47开始写入日志\n2017-06-30 10:48:48开始写入日志\n2017-06-30 10:48:49开始写入日志\n2017-06-30 10:48:50开始写入日志\n2017-06-30 10:48:51开始写入日志\n2017-06-30 10:48:52开始写入日志\n2017-06-30 10:48:53开始写入日志\n2017-06-30 10:48:54开始写入日志\n2017-06-30 10:48:55开始写入日志\n2017-06-30 10:48:56开始写入日志\n2017-06-30 10:48:57开始写入日志\n2017-06-30 10:48:58开始写入日志\n2017-06-30 10:48:59开始写入日志\n2017-06-30 10:49:00开始写入日志\n2017-06-30 10:49:01开始写入日志\n2017-06-30 10:49:02开始写入日志\n2017-06-30 10:49:03开始写入日志\n2017-06-30 10:49:04开始写入日志\n2017-06-30 10:49:05开始写入日志\n2017-06-30 10:49:06开始写入日志\n2017-06-30 10:49:07开始写入日志\n2017-06-30 10:49:08开始写入日志\n2017-06-30 10:49:09开始写入日志\n2017-06-30 10:49:10开始写入日志\n2017-06-30 10:49:11开始写入日志\n2017-06-30 10:49:12开始写入日志\n2017-06-30 10:49:13开始写入日志\n2017-06-30 10:49:14开始写入日志\n2017-06-30 10:49:15开始写入日志\n2017-06-30 10:49:16开始写入日志\n2017-06-30 10:49:17开始写入日志\n2017-06-30 10:49:18开始写入日志\n2017-06-30 10:49:19开始写入日志\n2017-06-30 10:49:20开始写入日志\n2017-06-30 10:49:21开始写入日志\n2017-06-30 10:49:22开始写入日志\n2017-06-30 10:49:23开始写入日志\n2017-06-30 10:49:24开始写入日志\n2017-06-30 10:49:25开始写入日志\n2017-06-30 10:49:26开始写入日志\n2017-06-30 10:49:27开始写入日志\n2017-06-30 10:49:28开始写入日志\n2017-06-30 10:49:29开始写入日志\n2017-06-30 10:49:30开始写入日志\n2017-06-30 10:49:31开始写入日志\n2017-06-30 10:49:32开始写入日志\n2017-06-30 10:49:33开始写入日志\n2017-06-30 10:49:34开始写入日志\n2017-06-30 10:49:35开始写入日志\n2017-06-30 10:49:36开始写入日志\n2017-06-30 10:49:37开始写入日志\n2017-06-30 10:49:38开始写入日志\n2017-06-30 10:49:39开始写入日志\n', 'signal: killed:', '-1', '250268', '1498790730'), ('2', '3', '2017-06-30 11:00:21开始写入日志\n2017-06-30 11:00:22开始写入日志\n2017-06-30 11:00:23开始写入日志\n2017-06-30 11:00:24开始写入日志\n2017-06-30 11:00:25开始写入日志\n2017-06-30 11:00:26开始写入日志\n2017-06-30 11:00:27开始写入日志\n2017-06-30 11:00:28开始写入日志\n2017-06-30 11:00:29开始写入日志\n2017-06-30 11:00:30开始写入日志\n', 'signal: killed:', '-1', '10292', '1498791620'), ('3', '3', '2017-06-30 11:21:56开始写入日志\n2017-06-30 11:21:57开始写入日志\n2017-06-30 11:21:58开始写入日志\n2017-06-30 11:21:59开始写入日志\n2017-06-30 11:22:00开始写入日志\n2017-06-30 11:22:01开始写入日志\n2017-06-30 11:22:02开始写入日志\n2017-06-30 11:22:03开始写入日志\n2017-06-30 11:22:04开始写入日志\n2017-06-30 11:22:05开始写入日志\n2017-06-30 11:22:06开始写入日志\n2017-06-30 11:22:07开始写入日志\n', 'signal: killed:', '-1', '12625', '1498792915'), ('4', '3', '2017-06-30 11:28:51开始写入日志\n2017-06-30 11:28:52开始写入日志\n', 'signal: killed:', '-1', '3123', '1498793330'), ('5', '3', '2017-06-30 12:05:01开始写入日志\n2017-06-30 12:05:02开始写入日志\n2017-06-30 12:05:03开始写入日志\n2017-06-30 12:05:04开始写入日志\n2017-06-30 12:05:05开始写入日志\n', 'signal: killed:', '-1', '6057', '1498795500'), ('6', '3', '2017-06-30 12:06:31开始写入日志\n2017-06-30 12:06:32开始写入日志\n2017-06-30 12:06:33开始写入日志\n2017-06-30 12:06:34开始写入日志\n2017-06-30 12:06:35开始写入日志\n2017-06-30 12:06:36开始写入日志\n2017-06-30 12:06:37开始写入日志\n2017-06-30 12:06:38开始写入日志\n2017-06-30 12:06:39开始写入日志\n', 'signal: killed:', '-1', '9896', '1498795590'), ('7', '3', '2017-06-30 12:17:21开始写入日志\n2017-06-30 12:17:22开始写入日志\n2017-06-30 12:17:23开始写入日志\n2017-06-30 12:17:24开始写入日志\n2017-06-30 12:17:25开始写入日志\n2017-06-30 12:17:26开始写入日志\n2017-06-30 12:17:27开始写入日志\n2017-06-30 12:17:28开始写入日志\n', 'signal: killed:', '-1', '8298', '1498796240'), ('8', '3', '2017-06-30 12:20:01开始写入日志\n2017-06-30 12:20:02开始写入日志\n2017-06-30 12:20:03开始写入日志\n2017-06-30 12:20:04开始写入日志\n2017-06-30 12:20:05开始写入日志\n2017-06-30 12:20:06开始写入日志\n2017-06-30 12:20:07开始写入日志\n2017-06-30 12:20:08开始写入日志\n2017-06-30 12:20:09开始写入日志\n2017-06-30 12:20:10开始写入日志\n', 'signal: killed:', '-1', '10617', '1498796400'), ('9', '3', '2017-06-30 12:56:16开始写入日志\n2017-06-30 12:56:17开始写入日志\n2017-06-30 12:56:18开始写入日志\n2017-06-30 12:56:19开始写入日志\n2017-06-30 12:56:20开始写入日志\n2017-06-30 12:56:21开始写入日志\n2017-06-30 12:56:22开始写入日志\n2017-06-30 12:56:23开始写入日志\n2017-06-30 12:56:24开始写入日志\n2017-06-30 12:56:25开始写入日志\n2017-06-30 12:56:26开始写入日志\n', 'signal: killed:', '-1', '11809', '1498798575'), ('10', '3', '2017-06-30 13:24:41开始写入日志\n2017-06-30 13:24:42开始写入日志\n2017-06-30 13:24:43开始写入日志\n2017-06-30 13:24:44开始写入日志\n2017-06-30 13:24:45开始写入日志\n2017-06-30 13:24:46开始写入日志\n2017-06-30 13:24:47开始写入日志\n2017-06-30 13:24:48开始写入日志\n2017-06-30 13:24:49开始写入日志\n2017-06-30 13:24:50开始写入日志\n2017-06-30 13:24:51开始写入日志\n2017-06-30 13:24:52开始写入日志\n2017-06-30 13:24:53开始写入日志\n2017-06-30 13:24:54开始写入日志\n2017-06-30 13:24:55开始写入日志\n2017-06-30 13:24:56开始写入日志\n2017-06-30 13:24:57开始写入日志\n2017-06-30 13:24:58开始写入日志\n2017-06-30 13:24:59开始写入日志\n2017-06-30 13:25:00开始写入日志\n2017-06-30 13:25:01开始写入日志\n2017-06-30 13:25:02开始写入日志\n2017-06-30 13:25:03开始写入日志\n2017-06-30 13:25:04开始写入日志\n2017-06-30 13:25:05开始写入日志\n2017-06-30 13:25:06开始写入日志\n', 'signal: killed:', '-1', '27203', '1498800280'), ('11', '3', '2017-06-30 13:56:41开始写入日志\n2017-06-30 13:56:42开始写入日志\n2017-06-30 13:56:43开始写入日志\n2017-06-30 13:56:44开始写入日志\n2017-06-30 13:56:45开始写入日志\n2017-06-30 13:56:46开始写入日志\n2017-06-30 13:56:47开始写入日志\n2017-06-30 13:56:48开始写入日志\n2017-06-30 13:56:49开始写入日志\n2017-06-30 13:56:50开始写入日志\n2017-06-30 13:56:51开始写入日志\n2017-06-30 13:56:52开始写入日志\n2017-06-30 13:56:53开始写入日志\n2017-06-30 13:56:54开始写入日志\n', 'signal: killed:', '-1', '14527', '1498802200'), ('12', '3', '2017-06-30 13:59:56开始写入日志\n2017-06-30 13:59:57开始写入日志\n2017-06-30 13:59:58开始写入日志\n2017-06-30 13:59:59开始写入日志\n2017-06-30 14:00:00开始写入日志\n2017-06-30 14:00:01开始写入日志\n2017-06-30 14:00:02开始写入日志\n2017-06-30 14:00:03开始写入日志\n', 'signal: killed:', '-1', '8550', '1498802395'), ('13', '3', '2017-06-30 14:02:41开始写入日志\n2017-06-30 14:02:42开始写入日志\n2017-06-30 14:02:43开始写入日志\n2017-06-30 14:02:44开始写入日志\n2017-06-30 14:02:45开始写入日志\n2017-06-30 14:02:46开始写入日志\n2017-06-30 14:02:47开始写入日志\nsignal: killed', '', '0', '7457', '1498802560'), ('14', '3', '2017-06-30 14:04:28开始写入日志\n2017-06-30 14:04:29开始写入日志\n2017-06-30 14:04:30开始写入日志\n2017-06-30 14:04:31开始写入日志\n2017-06-30 14:04:32开始写入日志\n2017-06-30 14:04:33开始写入日志\n2017-06-30 14:04:34开始写入日志\n2017-06-30 14:04:35开始写入日志\n2017-06-30 14:04:36开始写入日志\n2017-06-30 14:04:37开始写入日志\n2017-06-30 14:04:38开始写入日志\n2017-06-30 14:04:39开始写入日志\n2017-06-30 14:04:40开始写入日志\n2017-06-30 14:04:41开始写入日志\n2017-06-30 14:04:42开始写入日志\n2017-06-30 14:04:43开始写入日志\n2017-06-30 14:04:44开始写入日志\n2017-06-30 14:04:45开始写入日志\n2017-06-30 14:04:46开始写入日志\n2017-06-30 14:04:47开始写入日志\n2017-06-30 14:04:48开始写入日志\n2017-06-30 14:04:49开始写入日志\n2017-06-30 14:04:50开始写入日志\n2017-06-30 14:04:51开始写入日志\n2017-06-30 14:04:52开始写入日志\n2017-06-30 14:04:53开始写入日志\n2017-06-30 14:04:54开始写入日志\n2017-06-30 14:04:55开始写入日志\n2017-06-30 14:04:56开始写入日志\n2017-06-30 14:04:57开始写入日志\n2017-06-30 14:04:58开始写入日志\n2017-06-30 14:04:59开始写入日志\nsignal: killed', '', '0', '32806', '1498802667'), ('15', '3', '2017-06-30 15:20:26开始写入日志\n2017-06-30 15:20:27开始写入日志\n2017-06-30 15:20:28开始写入日志\n2017-06-30 15:20:29开始写入日志\n2017-06-30 15:20:30开始写入日志\n2017-06-30 15:20:31开始写入日志\n2017-06-30 15:20:32开始写入日志\n2017-06-30 15:20:33开始写入日志\n2017-06-30 15:20:34开始写入日志\n2017-06-30 15:20:35开始写入日志\n2017-06-30 15:20:36开始写入日志\n2017-06-30 15:20:37开始写入日志\n2017-06-30 15:20:38开始写入日志\n2017-06-30 15:20:39开始写入日志\n2017-06-30 15:20:40开始写入日志\n2017-06-30 15:20:41开始写入日志\n2017-06-30 15:20:42开始写入日志\n2017-06-30 15:20:43开始写入日志\n2017-06-30 15:20:44开始写入日志\n2017-06-30 15:20:45开始写入日志\n2017-06-30 15:20:46开始写入日志\n2017-06-30 15:20:47开始写入日志\n2017-06-30 15:20:48开始写入日志\n2017-06-30 15:20:49开始写入日志\n2017-06-30 15:20:50开始写入日志\n2017-06-30 15:20:51开始写入日志\n2017-06-30 15:20:52开始写入日志\n2017-06-30 15:20:53开始写入日志\n2017-06-30 15:20:54开始写入日志\n2017-06-30 15:20:55开始写入日志\nsignal: killed', '', '0', '31220', '1498807225'), ('16', '3', '2017-06-30 15:20:56开始写入日志\nsignal: killed', '', '0', '1228', '1498807255'), ('17', '3', '2017-06-30 15:38:16开始写入日志\n2017-06-30 15:38:17开始写入日志\n2017-06-30 15:38:18开始写入日志\n2017-06-30 15:38:19开始写入日志\n2017-06-30 15:38:20开始写入日志\n2017-06-30 15:38:21开始写入日志\n2017-06-30 15:38:22开始写入日志\n2017-06-30 15:38:23开始写入日志\n2017-06-30 15:38:24开始写入日志\n2017-06-30 15:38:25开始写入日志\n2017-06-30 15:38:26开始写入日志\nsignal: killed', '', '0', '12042', '1498808295'); +INSERT INTO `pp_task_log` VALUES ('1', '3', '2017-06-30 10:45:31开始写入日志\n2017-06-30 10:45:32开始写入日志\n2017-06-30 10:45:33开始写入日志\n2017-06-30 10:45:34开始写入日志\n2017-06-30 10:45:35开始写入日志\n2017-06-30 10:45:36开始写入日志\n2017-06-30 10:45:37开始写入日志\n2017-06-30 10:45:38开始写入日志\n2017-06-30 10:45:39开始写入日志\n2017-06-30 10:45:40开始写入日志\n2017-06-30 10:45:41开始写入日志\n2017-06-30 10:45:42开始写入日志\n2017-06-30 10:45:43开始写入日志\n2017-06-30 10:45:44开始写入日志\n2017-06-30 10:45:45开始写入日志\n2017-06-30 10:45:46开始写入日志\n2017-06-30 10:45:47开始写入日志\n2017-06-30 10:45:48开始写入日志\n2017-06-30 10:45:49开始写入日志\n2017-06-30 10:45:50开始写入日志\n2017-06-30 10:45:51开始写入日志\n2017-06-30 10:45:52开始写入日志\n2017-06-30 10:45:53开始写入日志\n2017-06-30 10:45:54开始写入日志\n2017-06-30 10:45:55开始写入日志\n2017-06-30 10:45:56开始写入日志\n2017-06-30 10:45:57开始写入日志\n2017-06-30 10:45:58开始写入日志\n2017-06-30 10:45:59开始写入日志\n2017-06-30 10:46:00开始写入日志\n2017-06-30 10:46:01开始写入日志\n2017-06-30 10:46:02开始写入日志\n2017-06-30 10:46:03开始写入日志\n2017-06-30 10:46:04开始写入日志\n2017-06-30 10:46:05开始写入日志\n2017-06-30 10:46:06开始写入日志\n2017-06-30 10:46:07开始写入日志\n2017-06-30 10:46:08开始写入日志\n2017-06-30 10:46:09开始写入日志\n2017-06-30 10:46:10开始写入日志\n2017-06-30 10:46:11开始写入日志\n2017-06-30 10:46:12开始写入日志\n2017-06-30 10:46:13开始写入日志\n2017-06-30 10:46:14开始写入日志\n2017-06-30 10:46:15开始写入日志\n2017-06-30 10:46:16开始写入日志\n2017-06-30 10:46:17开始写入日志\n2017-06-30 10:46:18开始写入日志\n2017-06-30 10:46:19开始写入日志\n2017-06-30 10:46:20开始写入日志\n2017-06-30 10:46:21开始写入日志\n2017-06-30 10:46:22开始写入日志\n2017-06-30 10:46:23开始写入日志\n2017-06-30 10:46:24开始写入日志\n2017-06-30 10:46:25开始写入日志\n2017-06-30 10:46:26开始写入日志\n2017-06-30 10:46:27开始写入日志\n2017-06-30 10:46:28开始写入日志\n2017-06-30 10:46:29开始写入日志\n2017-06-30 10:46:30开始写入日志\n2017-06-30 10:46:31开始写入日志\n2017-06-30 10:46:32开始写入日志\n2017-06-30 10:46:33开始写入日志\n2017-06-30 10:46:34开始写入日志\n2017-06-30 10:46:35开始写入日志\n2017-06-30 10:46:36开始写入日志\n2017-06-30 10:46:37开始写入日志\n2017-06-30 10:46:38开始写入日志\n2017-06-30 10:46:39开始写入日志\n2017-06-30 10:46:40开始写入日志\n2017-06-30 10:46:41开始写入日志\n2017-06-30 10:46:42开始写入日志\n2017-06-30 10:46:43开始写入日志\n2017-06-30 10:46:44开始写入日志\n2017-06-30 10:46:45开始写入日志\n2017-06-30 10:46:46开始写入日志\n2017-06-30 10:46:47开始写入日志\n2017-06-30 10:46:48开始写入日志\n2017-06-30 10:46:49开始写入日志\n2017-06-30 10:46:50开始写入日志\n2017-06-30 10:46:51开始写入日志\n2017-06-30 10:46:52开始写入日志\n2017-06-30 10:46:53开始写入日志\n2017-06-30 10:46:54开始写入日志\n2017-06-30 10:46:55开始写入日志\n2017-06-30 10:46:56开始写入日志\n2017-06-30 10:46:57开始写入日志\n2017-06-30 10:46:58开始写入日志\n2017-06-30 10:46:59开始写入日志\n2017-06-30 10:47:00开始写入日志\n2017-06-30 10:47:01开始写入日志\n2017-06-30 10:47:02开始写入日志\n2017-06-30 10:47:03开始写入日志\n2017-06-30 10:47:04开始写入日志\n2017-06-30 10:47:05开始写入日志\n2017-06-30 10:47:06开始写入日志\n2017-06-30 10:47:07开始写入日志\n2017-06-30 10:47:08开始写入日志\n2017-06-30 10:47:09开始写入日志\n2017-06-30 10:47:10开始写入日志\n2017-06-30 10:47:11开始写入日志\n2017-06-30 10:47:12开始写入日志\n2017-06-30 10:47:13开始写入日志\n2017-06-30 10:47:14开始写入日志\n2017-06-30 10:47:15开始写入日志\n2017-06-30 10:47:16开始写入日志\n2017-06-30 10:47:17开始写入日志\n2017-06-30 10:47:18开始写入日志\n2017-06-30 10:47:19开始写入日志\n2017-06-30 10:47:20开始写入日志\n2017-06-30 10:47:21开始写入日志\n2017-06-30 10:47:22开始写入日志\n2017-06-30 10:47:23开始写入日志\n2017-06-30 10:47:24开始写入日志\n2017-06-30 10:47:25开始写入日志\n2017-06-30 10:47:26开始写入日志\n2017-06-30 10:47:27开始写入日志\n2017-06-30 10:47:28开始写入日志\n2017-06-30 10:47:29开始写入日志\n2017-06-30 10:47:30开始写入日志\n2017-06-30 10:47:31开始写入日志\n2017-06-30 10:47:32开始写入日志\n2017-06-30 10:47:33开始写入日志\n2017-06-30 10:47:34开始写入日志\n2017-06-30 10:47:35开始写入日志\n2017-06-30 10:47:36开始写入日志\n2017-06-30 10:47:37开始写入日志\n2017-06-30 10:47:38开始写入日志\n2017-06-30 10:47:39开始写入日志\n2017-06-30 10:47:40开始写入日志\n2017-06-30 10:47:41开始写入日志\n2017-06-30 10:47:42开始写入日志\n2017-06-30 10:47:43开始写入日志\n2017-06-30 10:47:44开始写入日志\n2017-06-30 10:47:45开始写入日志\n2017-06-30 10:47:46开始写入日志\n2017-06-30 10:47:47开始写入日志\n2017-06-30 10:47:48开始写入日志\n2017-06-30 10:47:49开始写入日志\n2017-06-30 10:47:50开始写入日志\n2017-06-30 10:47:51开始写入日志\n2017-06-30 10:47:52开始写入日志\n2017-06-30 10:47:53开始写入日志\n2017-06-30 10:47:54开始写入日志\n2017-06-30 10:47:55开始写入日志\n2017-06-30 10:47:56开始写入日志\n2017-06-30 10:47:57开始写入日志\n2017-06-30 10:47:58开始写入日志\n2017-06-30 10:47:59开始写入日志\n2017-06-30 10:48:00开始写入日志\n2017-06-30 10:48:01开始写入日志\n2017-06-30 10:48:02开始写入日志\n2017-06-30 10:48:03开始写入日志\n2017-06-30 10:48:04开始写入日志\n2017-06-30 10:48:05开始写入日志\n2017-06-30 10:48:06开始写入日志\n2017-06-30 10:48:07开始写入日志\n2017-06-30 10:48:08开始写入日志\n2017-06-30 10:48:09开始写入日志\n2017-06-30 10:48:10开始写入日志\n2017-06-30 10:48:11开始写入日志\n2017-06-30 10:48:12开始写入日志\n2017-06-30 10:48:13开始写入日志\n2017-06-30 10:48:14开始写入日志\n2017-06-30 10:48:15开始写入日志\n2017-06-30 10:48:16开始写入日志\n2017-06-30 10:48:17开始写入日志\n2017-06-30 10:48:18开始写入日志\n2017-06-30 10:48:19开始写入日志\n2017-06-30 10:48:20开始写入日志\n2017-06-30 10:48:21开始写入日志\n2017-06-30 10:48:22开始写入日志\n2017-06-30 10:48:23开始写入日志\n2017-06-30 10:48:24开始写入日志\n2017-06-30 10:48:25开始写入日志\n2017-06-30 10:48:26开始写入日志\n2017-06-30 10:48:27开始写入日志\n2017-06-30 10:48:28开始写入日志\n2017-06-30 10:48:29开始写入日志\n2017-06-30 10:48:30开始写入日志\n2017-06-30 10:48:31开始写入日志\n2017-06-30 10:48:32开始写入日志\n2017-06-30 10:48:33开始写入日志\n2017-06-30 10:48:34开始写入日志\n2017-06-30 10:48:35开始写入日志\n2017-06-30 10:48:36开始写入日志\n2017-06-30 10:48:37开始写入日志\n2017-06-30 10:48:38开始写入日志\n2017-06-30 10:48:39开始写入日志\n2017-06-30 10:48:40开始写入日志\n2017-06-30 10:48:41开始写入日志\n2017-06-30 10:48:42开始写入日志\n2017-06-30 10:48:43开始写入日志\n2017-06-30 10:48:44开始写入日志\n2017-06-30 10:48:45开始写入日志\n2017-06-30 10:48:46开始写入日志\n2017-06-30 10:48:47开始写入日志\n2017-06-30 10:48:48开始写入日志\n2017-06-30 10:48:49开始写入日志\n2017-06-30 10:48:50开始写入日志\n2017-06-30 10:48:51开始写入日志\n2017-06-30 10:48:52开始写入日志\n2017-06-30 10:48:53开始写入日志\n2017-06-30 10:48:54开始写入日志\n2017-06-30 10:48:55开始写入日志\n2017-06-30 10:48:56开始写入日志\n2017-06-30 10:48:57开始写入日志\n2017-06-30 10:48:58开始写入日志\n2017-06-30 10:48:59开始写入日志\n2017-06-30 10:49:00开始写入日志\n2017-06-30 10:49:01开始写入日志\n2017-06-30 10:49:02开始写入日志\n2017-06-30 10:49:03开始写入日志\n2017-06-30 10:49:04开始写入日志\n2017-06-30 10:49:05开始写入日志\n2017-06-30 10:49:06开始写入日志\n2017-06-30 10:49:07开始写入日志\n2017-06-30 10:49:08开始写入日志\n2017-06-30 10:49:09开始写入日志\n2017-06-30 10:49:10开始写入日志\n2017-06-30 10:49:11开始写入日志\n2017-06-30 10:49:12开始写入日志\n2017-06-30 10:49:13开始写入日志\n2017-06-30 10:49:14开始写入日志\n2017-06-30 10:49:15开始写入日志\n2017-06-30 10:49:16开始写入日志\n2017-06-30 10:49:17开始写入日志\n2017-06-30 10:49:18开始写入日志\n2017-06-30 10:49:19开始写入日志\n2017-06-30 10:49:20开始写入日志\n2017-06-30 10:49:21开始写入日志\n2017-06-30 10:49:22开始写入日志\n2017-06-30 10:49:23开始写入日志\n2017-06-30 10:49:24开始写入日志\n2017-06-30 10:49:25开始写入日志\n2017-06-30 10:49:26开始写入日志\n2017-06-30 10:49:27开始写入日志\n2017-06-30 10:49:28开始写入日志\n2017-06-30 10:49:29开始写入日志\n2017-06-30 10:49:30开始写入日志\n2017-06-30 10:49:31开始写入日志\n2017-06-30 10:49:32开始写入日志\n2017-06-30 10:49:33开始写入日志\n2017-06-30 10:49:34开始写入日志\n2017-06-30 10:49:35开始写入日志\n2017-06-30 10:49:36开始写入日志\n2017-06-30 10:49:37开始写入日志\n2017-06-30 10:49:38开始写入日志\n2017-06-30 10:49:39开始写入日志\n', 'signal: killed:', '-1', '250268', '1498790730'), ('2', '3', '2017-06-30 11:00:21开始写入日志\n2017-06-30 11:00:22开始写入日志\n2017-06-30 11:00:23开始写入日志\n2017-06-30 11:00:24开始写入日志\n2017-06-30 11:00:25开始写入日志\n2017-06-30 11:00:26开始写入日志\n2017-06-30 11:00:27开始写入日志\n2017-06-30 11:00:28开始写入日志\n2017-06-30 11:00:29开始写入日志\n2017-06-30 11:00:30开始写入日志\n', 'signal: killed:', '-1', '10292', '1498791620'), ('3', '3', '2017-06-30 11:21:56开始写入日志\n2017-06-30 11:21:57开始写入日志\n2017-06-30 11:21:58开始写入日志\n2017-06-30 11:21:59开始写入日志\n2017-06-30 11:22:00开始写入日志\n2017-06-30 11:22:01开始写入日志\n2017-06-30 11:22:02开始写入日志\n2017-06-30 11:22:03开始写入日志\n2017-06-30 11:22:04开始写入日志\n2017-06-30 11:22:05开始写入日志\n2017-06-30 11:22:06开始写入日志\n2017-06-30 11:22:07开始写入日志\n', 'signal: killed:', '-1', '12625', '1498792915'), ('4', '3', '2017-06-30 11:28:51开始写入日志\n2017-06-30 11:28:52开始写入日志\n', 'signal: killed:', '-1', '3123', '1498793330'), ('5', '3', '2017-06-30 12:05:01开始写入日志\n2017-06-30 12:05:02开始写入日志\n2017-06-30 12:05:03开始写入日志\n2017-06-30 12:05:04开始写入日志\n2017-06-30 12:05:05开始写入日志\n', 'signal: killed:', '-1', '6057', '1498795500'), ('6', '3', '2017-06-30 12:06:31开始写入日志\n2017-06-30 12:06:32开始写入日志\n2017-06-30 12:06:33开始写入日志\n2017-06-30 12:06:34开始写入日志\n2017-06-30 12:06:35开始写入日志\n2017-06-30 12:06:36开始写入日志\n2017-06-30 12:06:37开始写入日志\n2017-06-30 12:06:38开始写入日志\n2017-06-30 12:06:39开始写入日志\n', 'signal: killed:', '-1', '9896', '1498795590'), ('7', '3', '2017-06-30 12:17:21开始写入日志\n2017-06-30 12:17:22开始写入日志\n2017-06-30 12:17:23开始写入日志\n2017-06-30 12:17:24开始写入日志\n2017-06-30 12:17:25开始写入日志\n2017-06-30 12:17:26开始写入日志\n2017-06-30 12:17:27开始写入日志\n2017-06-30 12:17:28开始写入日志\n', 'signal: killed:', '-1', '8298', '1498796240'), ('8', '3', '2017-06-30 12:20:01开始写入日志\n2017-06-30 12:20:02开始写入日志\n2017-06-30 12:20:03开始写入日志\n2017-06-30 12:20:04开始写入日志\n2017-06-30 12:20:05开始写入日志\n2017-06-30 12:20:06开始写入日志\n2017-06-30 12:20:07开始写入日志\n2017-06-30 12:20:08开始写入日志\n2017-06-30 12:20:09开始写入日志\n2017-06-30 12:20:10开始写入日志\n', 'signal: killed:', '-1', '10617', '1498796400'), ('9', '3', '2017-06-30 12:56:16开始写入日志\n2017-06-30 12:56:17开始写入日志\n2017-06-30 12:56:18开始写入日志\n2017-06-30 12:56:19开始写入日志\n2017-06-30 12:56:20开始写入日志\n2017-06-30 12:56:21开始写入日志\n2017-06-30 12:56:22开始写入日志\n2017-06-30 12:56:23开始写入日志\n2017-06-30 12:56:24开始写入日志\n2017-06-30 12:56:25开始写入日志\n2017-06-30 12:56:26开始写入日志\n', 'signal: killed:', '-1', '11809', '1498798575'), ('10', '3', '2017-06-30 13:24:41开始写入日志\n2017-06-30 13:24:42开始写入日志\n2017-06-30 13:24:43开始写入日志\n2017-06-30 13:24:44开始写入日志\n2017-06-30 13:24:45开始写入日志\n2017-06-30 13:24:46开始写入日志\n2017-06-30 13:24:47开始写入日志\n2017-06-30 13:24:48开始写入日志\n2017-06-30 13:24:49开始写入日志\n2017-06-30 13:24:50开始写入日志\n2017-06-30 13:24:51开始写入日志\n2017-06-30 13:24:52开始写入日志\n2017-06-30 13:24:53开始写入日志\n2017-06-30 13:24:54开始写入日志\n2017-06-30 13:24:55开始写入日志\n2017-06-30 13:24:56开始写入日志\n2017-06-30 13:24:57开始写入日志\n2017-06-30 13:24:58开始写入日志\n2017-06-30 13:24:59开始写入日志\n2017-06-30 13:25:00开始写入日志\n2017-06-30 13:25:01开始写入日志\n2017-06-30 13:25:02开始写入日志\n2017-06-30 13:25:03开始写入日志\n2017-06-30 13:25:04开始写入日志\n2017-06-30 13:25:05开始写入日志\n2017-06-30 13:25:06开始写入日志\n', 'signal: killed:', '-1', '27203', '1498800280'), ('11', '3', '2017-06-30 13:56:41开始写入日志\n2017-06-30 13:56:42开始写入日志\n2017-06-30 13:56:43开始写入日志\n2017-06-30 13:56:44开始写入日志\n2017-06-30 13:56:45开始写入日志\n2017-06-30 13:56:46开始写入日志\n2017-06-30 13:56:47开始写入日志\n2017-06-30 13:56:48开始写入日志\n2017-06-30 13:56:49开始写入日志\n2017-06-30 13:56:50开始写入日志\n2017-06-30 13:56:51开始写入日志\n2017-06-30 13:56:52开始写入日志\n2017-06-30 13:56:53开始写入日志\n2017-06-30 13:56:54开始写入日志\n', 'signal: killed:', '-1', '14527', '1498802200'), ('12', '3', '2017-06-30 13:59:56开始写入日志\n2017-06-30 13:59:57开始写入日志\n2017-06-30 13:59:58开始写入日志\n2017-06-30 13:59:59开始写入日志\n2017-06-30 14:00:00开始写入日志\n2017-06-30 14:00:01开始写入日志\n2017-06-30 14:00:02开始写入日志\n2017-06-30 14:00:03开始写入日志\n', 'signal: killed:', '-1', '8550', '1498802395'), ('13', '3', '2017-06-30 14:02:41开始写入日志\n2017-06-30 14:02:42开始写入日志\n2017-06-30 14:02:43开始写入日志\n2017-06-30 14:02:44开始写入日志\n2017-06-30 14:02:45开始写入日志\n2017-06-30 14:02:46开始写入日志\n2017-06-30 14:02:47开始写入日志\nsignal: killed', '', '0', '7457', '1498802560'), ('14', '3', '2017-06-30 14:04:28开始写入日志\n2017-06-30 14:04:29开始写入日志\n2017-06-30 14:04:30开始写入日志\n2017-06-30 14:04:31开始写入日志\n2017-06-30 14:04:32开始写入日志\n2017-06-30 14:04:33开始写入日志\n2017-06-30 14:04:34开始写入日志\n2017-06-30 14:04:35开始写入日志\n2017-06-30 14:04:36开始写入日志\n2017-06-30 14:04:37开始写入日志\n2017-06-30 14:04:38开始写入日志\n2017-06-30 14:04:39开始写入日志\n2017-06-30 14:04:40开始写入日志\n2017-06-30 14:04:41开始写入日志\n2017-06-30 14:04:42开始写入日志\n2017-06-30 14:04:43开始写入日志\n2017-06-30 14:04:44开始写入日志\n2017-06-30 14:04:45开始写入日志\n2017-06-30 14:04:46开始写入日志\n2017-06-30 14:04:47开始写入日志\n2017-06-30 14:04:48开始写入日志\n2017-06-30 14:04:49开始写入日志\n2017-06-30 14:04:50开始写入日志\n2017-06-30 14:04:51开始写入日志\n2017-06-30 14:04:52开始写入日志\n2017-06-30 14:04:53开始写入日志\n2017-06-30 14:04:54开始写入日志\n2017-06-30 14:04:55开始写入日志\n2017-06-30 14:04:56开始写入日志\n2017-06-30 14:04:57开始写入日志\n2017-06-30 14:04:58开始写入日志\n2017-06-30 14:04:59开始写入日志\nsignal: killed', '', '0', '32806', '1498802667'), ('15', '3', '2017-06-30 15:20:26开始写入日志\n2017-06-30 15:20:27开始写入日志\n2017-06-30 15:20:28开始写入日志\n2017-06-30 15:20:29开始写入日志\n2017-06-30 15:20:30开始写入日志\n2017-06-30 15:20:31开始写入日志\n2017-06-30 15:20:32开始写入日志\n2017-06-30 15:20:33开始写入日志\n2017-06-30 15:20:34开始写入日志\n2017-06-30 15:20:35开始写入日志\n2017-06-30 15:20:36开始写入日志\n2017-06-30 15:20:37开始写入日志\n2017-06-30 15:20:38开始写入日志\n2017-06-30 15:20:39开始写入日志\n2017-06-30 15:20:40开始写入日志\n2017-06-30 15:20:41开始写入日志\n2017-06-30 15:20:42开始写入日志\n2017-06-30 15:20:43开始写入日志\n2017-06-30 15:20:44开始写入日志\n2017-06-30 15:20:45开始写入日志\n2017-06-30 15:20:46开始写入日志\n2017-06-30 15:20:47开始写入日志\n2017-06-30 15:20:48开始写入日志\n2017-06-30 15:20:49开始写入日志\n2017-06-30 15:20:50开始写入日志\n2017-06-30 15:20:51开始写入日志\n2017-06-30 15:20:52开始写入日志\n2017-06-30 15:20:53开始写入日志\n2017-06-30 15:20:54开始写入日志\n2017-06-30 15:20:55开始写入日志\nsignal: killed', '', '0', '31220', '1498807225'), ('16', '3', '2017-06-30 15:20:56开始写入日志\nsignal: killed', '', '0', '1228', '1498807255'), ('17', '3', '2017-06-30 15:38:16开始写入日志\n2017-06-30 15:38:17开始写入日志\n2017-06-30 15:38:18开始写入日志\n2017-06-30 15:38:19开始写入日志\n2017-06-30 15:38:20开始写入日志\n2017-06-30 15:38:21开始写入日志\n2017-06-30 15:38:22开始写入日志\n2017-06-30 15:38:23开始写入日志\n2017-06-30 15:38:24开始写入日志\n2017-06-30 15:38:25开始写入日志\n2017-06-30 15:38:26开始写入日志\nsignal: killed', '', '0', '12042', '1498808295'), ('18', '5', '', '', '0', '27', '1499072538'); COMMIT; -- ---------------------------- diff --git a/views/task/add.html b/views/task/add.html index 76cf7f1..458ace8 100644 --- a/views/task/add.html +++ b/views/task/add.html @@ -30,16 +30,6 @@ -
- -
- -
-
- -
-
-
@@ -80,21 +70,6 @@
-
- -
- - -
-
- -
-
-
diff --git a/views/task/edit.html b/views/task/edit.html index c7e10c3..8350316 100644 --- a/views/task/edit.html +++ b/views/task/edit.html @@ -30,15 +30,6 @@
-
- -
- -
-
- -
-
@@ -80,21 +71,6 @@
-
- -
- - -
-
- -
-
-
diff --git a/views/task/list.html b/views/task/list.html index ef2b1fd..0aad1f5 100644 --- a/views/task/list.html +++ b/views/task/list.html @@ -62,7 +62,6 @@ 任务名称 时间表达式 任务说明 - 任务类型 上次执行时间 下次执行时间 操作 @@ -84,14 +83,6 @@ {{$v.cron_spec}} {{$v.description}} - - {{if eq $v.task_type 0}} - 定时任务 - {{else}} - 常驻任务 - {{end}} - - {{$v.prev_time}} {{$v.next_time}} @@ -107,14 +98,9 @@ 编辑 - - {{if eq $v.task_type 0}} - + 执行 - - {{end}} - - + 日志