From a1344636466700611112822c783a5de75e680dd7 Mon Sep 17 00:00:00 2001 From: manuel83 Date: Sat, 15 Dec 2018 00:01:37 +0100 Subject: [PATCH] step controller is using scheduler now --- .idea/workspace.xml | 534 +++++++++++++++------------- core/controller/actor_controller.py | 5 +- core/controller/step_controller.py | 34 +- core/job/_scheduler.py | 2 +- craftbeerpi.db | Bin 53248 -> 53248 bytes logger.conf | 44 --- logger.conf.2018-11-18_20-46 | 60 ---- logger.conf.2018-11-18_20-47 | 60 ---- logger.conf.2018-11-18_20-48 | 59 --- logger.conf.2018-11-18_20-49 | 60 ---- logger.conf.2018-11-18_20-50 | 60 ---- 11 files changed, 301 insertions(+), 617 deletions(-) delete mode 100644 logger.conf delete mode 100644 logger.conf.2018-11-18_20-46 delete mode 100644 logger.conf.2018-11-18_20-47 delete mode 100644 logger.conf.2018-11-18_20-48 delete mode 100644 logger.conf.2018-11-18_20-49 delete mode 100644 logger.conf.2018-11-18_20-50 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5dd97e0..9d09ff3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,27 +2,17 @@ + + + + + + - - - - - - - - - - - - - - - - @@ -196,8 +213,6 @@ - *bus.fire( - a*bus.fire( as*bus.fire( asyc*bus.fire( asy*bus.fire( @@ -226,6 +241,8 @@ cbpi.bus.fi cbpi.bus.fire cbpi.bus.fire + fire + schedul @@ -251,7 +268,6 @@ @@ -306,10 +323,10 @@ DEFINITION_ORDER - @@ -342,90 +359,6 @@ - + - + - - - + + + @@ -1190,30 +1207,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1583,14 +1576,6 @@ - - - - - - - - @@ -1601,16 +1586,6 @@ - - - - - - - - - - @@ -1619,13 +1594,11 @@ - + - - - - - + + + @@ -1639,20 +1612,71 @@ + + + + + + + + + + + + + + + + + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/controller/actor_controller.py b/core/controller/actor_controller.py index 69c74d7..80aa98a 100644 --- a/core/controller/actor_controller.py +++ b/core/controller/actor_controller.py @@ -1,14 +1,11 @@ -import pprint from asyncio import Future -import asyncio + from aiohttp import web -from core.api.actor import CBPiActor from core.api.decorator import on_event, request_mapping from core.controller.crud_controller import CRUDController from core.database.model import ActorModel from core.http_endpoints.http_api import HttpAPI -from core.utils import parse_props class ActorHttp(HttpAPI): diff --git a/core/controller/step_controller.py b/core/controller/step_controller.py index d9365d5..1fc7242 100644 --- a/core/controller/step_controller.py +++ b/core/controller/step_controller.py @@ -4,6 +4,7 @@ from core.api import on_event, request_mapping from core.controller.crud_controller import CRUDController from core.database.model import StepModel from core.http_endpoints.http_api import HttpAPI +from core.job.aiohttp import get_scheduler_from_app class StepController(HttpAPI, CRUDController): @@ -25,6 +26,8 @@ class StepController(HttpAPI, CRUDController): self.current_step = None self.cbpi.register(self, "/step") + + async def init(self): ''' Initializer of the the Step Controller. @@ -136,7 +139,7 @@ class StepController(HttpAPI, CRUDController): if self.current_step is not None: - self.current_task.cancel() + self.current_job.stop() self.current_step.reset() self.steps[self.current_step.id]["state"] = None @@ -162,8 +165,10 @@ class StepController(HttpAPI, CRUDController): self.current_step = None - @on_event("step/+/done") - async def handle_done(self, topic, **kwargs): + + + @on_event("job/step/done") + async def handle_step_done(self, topic, **kwargs): ''' Event Handler for "step/+/done". @@ -173,15 +178,15 @@ class StepController(HttpAPI, CRUDController): :param kwargs: :return: ''' + + print("JOB DONE STEP") + self.cache[self.current_step.id].state = "D" + step_id = self.current_step.id + self.current_step = None + await self.start() - def _step_done(self, task): - if task.cancelled() == False: - self.cache[self.current_step.id].state = "D" - step_id = self.current_step.id - self.current_step = None - self.cbpi.bus.sync_fire("step/%s/done" % step_id) def _get_manged_fields_as_array(self, type_cfg): print("tYPE", type_cfg) @@ -205,13 +210,14 @@ class StepController(HttpAPI, CRUDController): for key, step in self.cache.items(): if step.state is None: step_type = self.types["CustomStepCBPi"] - print("----------") - print(step_type) - print("----------") + config = dict(cbpi = self.cbpi, id=key, name=step.name, managed_fields=self._get_manged_fields_as_array(step_type)) self.current_step = step_type["class"](**config) - self.current_task = loop.create_task(self.current_step.run()) - self.current_task.add_done_callback(self._step_done) + + self.current_job = await self.cbpi.start_job(self.current_step.run(), step.name, "step") + await asyncio.sleep(4) + await self.current_job.close() + open_step = True break if open_step == False: diff --git a/core/job/_scheduler.py b/core/job/_scheduler.py index 75e8823..2d9d73b 100644 --- a/core/job/_scheduler.py +++ b/core/job/_scheduler.py @@ -114,7 +114,7 @@ class Scheduler(*bases): def _done(self, job): print("JOB DONE") - self.cbpi.bus.sync_fire("job/done", key=job.name) + self.cbpi.bus.sync_fire("job/%s/done" % job.type, type=job.type, key=job.name) self._jobs.discard(job) if not self.pending_count: return diff --git a/craftbeerpi.db b/craftbeerpi.db index 32086e0e66a908d5b1d6c8b326ab7ea92a613a24..d8154ee73427f0c1d055a358df1faaaf81aabc49 100644 GIT binary patch delta 91 zcmZozz}&Ead4e=!?L--8#@dYuOZ3G!`OY!$-{arIKa0PDKaAgmUx@Dm-?_;G20J!i hGWf&Gq`*1(fxQBg0tbX*hfr(~iWNj{uCVWz0037r9r^$O delta 83 zcmZozz}&Ead4e=!#Y7or#)^#zOZ0hI_$wIr@A2>9pT%D>S;1h_WCH_%&6f=R@Uk#4 eFbYgER$yXy2PV&e$yH#oWAX+&`OTH~?Gpe^q8dy9 diff --git a/logger.conf b/logger.conf deleted file mode 100644 index 88ab5e1..0000000 --- a/logger.conf +++ /dev/null @@ -1,44 +0,0 @@ -2018-11-18 20:51:31,507,1,WOOHO -2018-11-18 20:51:32,513,1,WOOHO -2018-11-18 20:51:33,514,1,WOOHO -2018-11-18 20:51:34,518,1,WOOHO -2018-11-18 20:51:35,523,1,WOOHO -2018-11-18 20:51:36,528,1,WOOHO -2018-11-18 20:51:37,531,1,WOOHO -2018-11-18 20:51:38,536,1,WOOHO -2018-11-18 20:51:39,538,1,WOOHO -2018-11-18 20:51:40,542,1,WOOHO -2018-11-18 20:51:41,547,1,WOOHO -2018-11-18 20:51:42,550,1,WOOHO -2018-11-18 20:51:43,551,1,WOOHO -2018-11-18 20:51:44,555,1,WOOHO -2018-11-18 20:51:45,559,1,WOOHO -2018-11-18 20:51:46,563,1,WOOHO -2018-11-18 20:51:47,567,1,WOOHO -2018-11-18 20:51:48,568,1,WOOHO -2018-11-18 20:51:49,572,1,WOOHO -2018-11-18 20:51:50,573,1,WOOHO -2018-11-18 20:51:51,579,1,WOOHO -2018-11-18 20:51:52,584,1,WOOHO -2018-11-18 20:51:53,591,1,WOOHO -2018-11-18 20:51:54,594,1,WOOHO -2018-11-18 20:51:55,598,1,WOOHO -2018-11-18 20:51:56,603,1,WOOHO -2018-11-18 20:51:57,606,1,WOOHO -2018-11-18 20:51:58,610,1,WOOHO -2018-11-18 20:51:59,614,1,WOOHO -2018-11-18 20:52:00,618,1,WOOHO -2018-11-18 20:52:01,621,1,WOOHO -2018-11-18 20:52:02,622,1,WOOHO -2018-11-18 20:52:03,626,1,WOOHO -2018-11-18 20:52:04,630,1,WOOHO -2018-11-18 20:52:05,634,1,WOOHO -2018-11-18 20:52:06,638,1,WOOHO -2018-11-18 20:52:07,642,1,WOOHO -2018-11-18 20:52:08,646,1,WOOHO -2018-11-18 20:52:09,651,1,WOOHO -2018-11-18 20:52:10,655,1,WOOHO -2018-11-18 20:52:11,657,1,WOOHO -2018-11-18 20:52:12,662,1,WOOHO -2018-11-18 20:52:13,666,1,WOOHO -2018-11-18 20:52:14,670,1,WOOHO diff --git a/logger.conf.2018-11-18_20-46 b/logger.conf.2018-11-18_20-46 deleted file mode 100644 index 6da129c..0000000 --- a/logger.conf.2018-11-18_20-46 +++ /dev/null @@ -1,60 +0,0 @@ -2018-11-18 20:46:31,513,1,WOOHO -2018-11-18 20:46:32,516,1,WOOHO -2018-11-18 20:46:33,521,1,WOOHO -2018-11-18 20:46:34,524,1,WOOHO -2018-11-18 20:46:35,528,1,WOOHO -2018-11-18 20:46:36,532,1,WOOHO -2018-11-18 20:46:37,535,1,WOOHO -2018-11-18 20:46:38,537,1,WOOHO -2018-11-18 20:46:39,538,1,WOOHO -2018-11-18 20:46:40,540,1,WOOHO -2018-11-18 20:46:41,541,1,WOOHO -2018-11-18 20:46:42,546,1,WOOHO -2018-11-18 20:46:43,550,1,WOOHO -2018-11-18 20:46:44,553,1,WOOHO -2018-11-18 20:46:45,556,1,WOOHO -2018-11-18 20:46:46,560,1,WOOHO -2018-11-18 20:46:47,562,1,WOOHO -2018-11-18 20:46:48,568,1,WOOHO -2018-11-18 20:46:49,571,1,WOOHO -2018-11-18 20:46:50,575,1,WOOHO -2018-11-18 20:46:51,582,1,WOOHO -2018-11-18 20:46:52,585,1,WOOHO -2018-11-18 20:46:53,592,1,WOOHO -2018-11-18 20:46:54,596,1,WOOHO -2018-11-18 20:46:55,599,1,WOOHO -2018-11-18 20:46:56,601,1,WOOHO -2018-11-18 20:46:57,603,1,WOOHO -2018-11-18 20:46:58,607,1,WOOHO -2018-11-18 20:46:59,612,1,WOOHO -2018-11-18 20:47:00,614,1,WOOHO -2018-11-18 20:47:01,617,1,WOOHO -2018-11-18 20:47:02,620,1,WOOHO -2018-11-18 20:47:03,623,1,WOOHO -2018-11-18 20:47:04,626,1,WOOHO -2018-11-18 20:47:05,629,1,WOOHO -2018-11-18 20:47:06,634,1,WOOHO -2018-11-18 20:47:07,638,1,WOOHO -2018-11-18 20:47:08,643,1,WOOHO -2018-11-18 20:47:09,645,1,WOOHO -2018-11-18 20:47:10,650,1,WOOHO -2018-11-18 20:47:11,650,1,WOOHO -2018-11-18 20:47:12,656,1,WOOHO -2018-11-18 20:47:13,661,1,WOOHO -2018-11-18 20:47:14,663,1,WOOHO -2018-11-18 20:47:15,666,1,WOOHO -2018-11-18 20:47:16,669,1,WOOHO -2018-11-18 20:47:17,670,1,WOOHO -2018-11-18 20:47:18,671,1,WOOHO -2018-11-18 20:47:19,676,1,WOOHO -2018-11-18 20:47:20,678,1,WOOHO -2018-11-18 20:47:21,683,1,WOOHO -2018-11-18 20:47:22,684,1,WOOHO -2018-11-18 20:47:23,688,1,WOOHO -2018-11-18 20:47:24,692,1,WOOHO -2018-11-18 20:47:25,694,1,WOOHO -2018-11-18 20:47:26,698,1,WOOHO -2018-11-18 20:47:27,699,1,WOOHO -2018-11-18 20:47:28,701,1,WOOHO -2018-11-18 20:47:29,703,1,WOOHO -2018-11-18 20:47:30,703,1,WOOHO diff --git a/logger.conf.2018-11-18_20-47 b/logger.conf.2018-11-18_20-47 deleted file mode 100644 index ea1a878..0000000 --- a/logger.conf.2018-11-18_20-47 +++ /dev/null @@ -1,60 +0,0 @@ -2018-11-18 20:47:31,707,1,WOOHO -2018-11-18 20:47:32,710,1,WOOHO -2018-11-18 20:47:33,715,1,WOOHO -2018-11-18 20:47:34,716,1,WOOHO -2018-11-18 20:47:35,717,1,WOOHO -2018-11-18 20:47:36,722,1,WOOHO -2018-11-18 20:47:37,727,1,WOOHO -2018-11-18 20:47:38,728,1,WOOHO -2018-11-18 20:47:39,731,1,WOOHO -2018-11-18 20:47:40,732,1,WOOHO -2018-11-18 20:47:41,736,1,WOOHO -2018-11-18 20:47:42,737,1,WOOHO -2018-11-18 20:47:43,741,1,WOOHO -2018-11-18 20:47:44,744,1,WOOHO -2018-11-18 20:47:45,745,1,WOOHO -2018-11-18 20:47:46,747,1,WOOHO -2018-11-18 20:47:47,751,1,WOOHO -2018-11-18 20:47:48,756,1,WOOHO -2018-11-18 20:47:49,757,1,WOOHO -2018-11-18 20:47:50,763,1,WOOHO -2018-11-18 20:47:51,768,1,WOOHO -2018-11-18 20:47:52,772,1,WOOHO -2018-11-18 20:47:53,779,1,WOOHO -2018-11-18 20:47:54,782,1,WOOHO -2018-11-18 20:47:55,783,1,WOOHO -2018-11-18 20:47:56,787,1,WOOHO -2018-11-18 20:47:57,789,1,WOOHO -2018-11-18 20:47:58,792,1,WOOHO -2018-11-18 20:47:59,793,1,WOOHO -2018-11-18 20:48:00,797,1,WOOHO -2018-11-18 20:48:01,800,1,WOOHO -2018-11-18 20:48:02,805,1,WOOHO -2018-11-18 20:48:03,809,1,WOOHO -2018-11-18 20:48:04,810,1,WOOHO -2018-11-18 20:48:05,816,1,WOOHO -2018-11-18 20:48:06,819,1,WOOHO -2018-11-18 20:48:07,825,1,WOOHO -2018-11-18 20:48:08,829,1,WOOHO -2018-11-18 20:48:09,835,1,WOOHO -2018-11-18 20:48:10,838,1,WOOHO -2018-11-18 20:48:11,839,1,WOOHO -2018-11-18 20:48:12,844,1,WOOHO -2018-11-18 20:48:13,845,1,WOOHO -2018-11-18 20:48:14,848,1,WOOHO -2018-11-18 20:48:15,850,1,WOOHO -2018-11-18 20:48:16,852,1,WOOHO -2018-11-18 20:48:17,854,1,WOOHO -2018-11-18 20:48:18,859,1,WOOHO -2018-11-18 20:48:19,859,1,WOOHO -2018-11-18 20:48:20,864,1,WOOHO -2018-11-18 20:48:21,868,1,WOOHO -2018-11-18 20:48:22,869,1,WOOHO -2018-11-18 20:48:23,876,1,WOOHO -2018-11-18 20:48:24,877,1,WOOHO -2018-11-18 20:48:25,879,1,WOOHO -2018-11-18 20:48:26,884,1,WOOHO -2018-11-18 20:48:27,889,1,WOOHO -2018-11-18 20:48:28,892,1,WOOHO -2018-11-18 20:48:29,895,1,WOOHO -2018-11-18 20:48:30,901,1,WOOHO diff --git a/logger.conf.2018-11-18_20-48 b/logger.conf.2018-11-18_20-48 deleted file mode 100644 index a67b179..0000000 --- a/logger.conf.2018-11-18_20-48 +++ /dev/null @@ -1,59 +0,0 @@ -2018-11-18 20:48:31,906,1,WOOHO -2018-11-18 20:48:32,914,1,WOOHO -2018-11-18 20:48:33,917,1,WOOHO -2018-11-18 20:48:34,922,1,WOOHO -2018-11-18 20:48:35,924,1,WOOHO -2018-11-18 20:48:36,924,1,WOOHO -2018-11-18 20:48:37,928,1,WOOHO -2018-11-18 20:48:38,931,1,WOOHO -2018-11-18 20:48:39,935,1,WOOHO -2018-11-18 20:48:40,936,1,WOOHO -2018-11-18 20:48:41,940,1,WOOHO -2018-11-18 20:48:42,944,1,WOOHO -2018-11-18 20:48:43,947,1,WOOHO -2018-11-18 20:48:44,951,1,WOOHO -2018-11-18 20:48:45,952,1,WOOHO -2018-11-18 20:48:46,953,1,WOOHO -2018-11-18 20:48:47,954,1,WOOHO -2018-11-18 20:48:48,960,1,WOOHO -2018-11-18 20:48:49,964,1,WOOHO -2018-11-18 20:48:50,968,1,WOOHO -2018-11-18 20:48:51,969,1,WOOHO -2018-11-18 20:48:52,974,1,WOOHO -2018-11-18 20:48:53,980,1,WOOHO -2018-11-18 20:48:54,981,1,WOOHO -2018-11-18 20:48:55,985,1,WOOHO -2018-11-18 20:48:56,991,1,WOOHO -2018-11-18 20:48:57,995,1,WOOHO -2018-11-18 20:48:58,996,1,WOOHO -2018-11-18 20:49:00,001,1,WOOHO -2018-11-18 20:49:01,004,1,WOOHO -2018-11-18 20:49:02,005,1,WOOHO -2018-11-18 20:49:03,009,1,WOOHO -2018-11-18 20:49:04,011,1,WOOHO -2018-11-18 20:49:05,013,1,WOOHO -2018-11-18 20:49:06,017,1,WOOHO -2018-11-18 20:49:07,022,1,WOOHO -2018-11-18 20:49:08,027,1,WOOHO -2018-11-18 20:49:09,029,1,WOOHO -2018-11-18 20:49:10,031,1,WOOHO -2018-11-18 20:49:11,035,1,WOOHO -2018-11-18 20:49:12,039,1,WOOHO -2018-11-18 20:49:13,044,1,WOOHO -2018-11-18 20:49:14,045,1,WOOHO -2018-11-18 20:49:15,049,1,WOOHO -2018-11-18 20:49:16,051,1,WOOHO -2018-11-18 20:49:17,056,1,WOOHO -2018-11-18 20:49:18,057,1,WOOHO -2018-11-18 20:49:19,063,1,WOOHO -2018-11-18 20:49:20,068,1,WOOHO -2018-11-18 20:49:21,069,1,WOOHO -2018-11-18 20:49:22,072,1,WOOHO -2018-11-18 20:49:23,077,1,WOOHO -2018-11-18 20:49:24,081,1,WOOHO -2018-11-18 20:49:25,082,1,WOOHO -2018-11-18 20:49:26,087,1,WOOHO -2018-11-18 20:49:27,088,1,WOOHO -2018-11-18 20:49:28,092,1,WOOHO -2018-11-18 20:49:29,097,1,WOOHO -2018-11-18 20:49:30,099,1,WOOHO diff --git a/logger.conf.2018-11-18_20-49 b/logger.conf.2018-11-18_20-49 deleted file mode 100644 index ac59333..0000000 --- a/logger.conf.2018-11-18_20-49 +++ /dev/null @@ -1,60 +0,0 @@ -2018-11-18 20:49:31,101,1,WOOHO -2018-11-18 20:49:32,105,1,WOOHO -2018-11-18 20:49:33,110,1,WOOHO -2018-11-18 20:49:34,112,1,WOOHO -2018-11-18 20:49:35,117,1,WOOHO -2018-11-18 20:49:36,118,1,WOOHO -2018-11-18 20:49:37,122,1,WOOHO -2018-11-18 20:49:38,124,1,WOOHO -2018-11-18 20:49:39,126,1,WOOHO -2018-11-18 20:49:40,127,1,WOOHO -2018-11-18 20:49:41,128,1,WOOHO -2018-11-18 20:49:42,134,1,WOOHO -2018-11-18 20:49:43,136,1,WOOHO -2018-11-18 20:49:44,139,1,WOOHO -2018-11-18 20:49:45,142,1,WOOHO -2018-11-18 20:49:46,147,1,WOOHO -2018-11-18 20:49:47,150,1,WOOHO -2018-11-18 20:49:48,151,1,WOOHO -2018-11-18 20:49:49,155,1,WOOHO -2018-11-18 20:49:50,157,1,WOOHO -2018-11-18 20:49:51,160,1,WOOHO -2018-11-18 20:49:52,166,1,WOOHO -2018-11-18 20:49:53,167,1,WOOHO -2018-11-18 20:49:54,173,1,WOOHO -2018-11-18 20:49:55,177,1,WOOHO -2018-11-18 20:49:56,182,1,WOOHO -2018-11-18 20:49:57,183,1,WOOHO -2018-11-18 20:49:58,187,1,WOOHO -2018-11-18 20:49:59,189,1,WOOHO -2018-11-18 20:50:00,193,1,WOOHO -2018-11-18 20:50:01,197,1,WOOHO -2018-11-18 20:50:02,202,1,WOOHO -2018-11-18 20:50:03,204,1,WOOHO -2018-11-18 20:50:04,210,1,WOOHO -2018-11-18 20:50:05,211,1,WOOHO -2018-11-18 20:50:06,214,1,WOOHO -2018-11-18 20:50:07,215,1,WOOHO -2018-11-18 20:50:08,217,1,WOOHO -2018-11-18 20:50:09,219,1,WOOHO -2018-11-18 20:50:10,221,1,WOOHO -2018-11-18 20:50:11,225,1,WOOHO -2018-11-18 20:50:12,230,1,WOOHO -2018-11-18 20:50:13,235,1,WOOHO -2018-11-18 20:50:14,239,1,WOOHO -2018-11-18 20:50:15,243,1,WOOHO -2018-11-18 20:50:16,244,1,WOOHO -2018-11-18 20:50:17,248,1,WOOHO -2018-11-18 20:50:18,253,1,WOOHO -2018-11-18 20:50:19,254,1,WOOHO -2018-11-18 20:50:20,254,1,WOOHO -2018-11-18 20:50:21,259,1,WOOHO -2018-11-18 20:50:22,264,1,WOOHO -2018-11-18 20:50:23,271,1,WOOHO -2018-11-18 20:50:24,277,1,WOOHO -2018-11-18 20:50:25,281,1,WOOHO -2018-11-18 20:50:26,286,1,WOOHO -2018-11-18 20:50:27,292,1,WOOHO -2018-11-18 20:50:28,294,1,WOOHO -2018-11-18 20:50:29,297,1,WOOHO -2018-11-18 20:50:30,300,1,WOOHO diff --git a/logger.conf.2018-11-18_20-50 b/logger.conf.2018-11-18_20-50 deleted file mode 100644 index d6e6c34..0000000 --- a/logger.conf.2018-11-18_20-50 +++ /dev/null @@ -1,60 +0,0 @@ -2018-11-18 20:50:31,302,1,WOOHO -2018-11-18 20:50:32,305,1,WOOHO -2018-11-18 20:50:33,309,1,WOOHO -2018-11-18 20:50:34,310,1,WOOHO -2018-11-18 20:50:35,311,1,WOOHO -2018-11-18 20:50:36,317,1,WOOHO -2018-11-18 20:50:37,319,1,WOOHO -2018-11-18 20:50:38,321,1,WOOHO -2018-11-18 20:50:39,324,1,WOOHO -2018-11-18 20:50:40,325,1,WOOHO -2018-11-18 20:50:41,326,1,WOOHO -2018-11-18 20:50:42,332,1,WOOHO -2018-11-18 20:50:43,338,1,WOOHO -2018-11-18 20:50:44,339,1,WOOHO -2018-11-18 20:50:45,345,1,WOOHO -2018-11-18 20:50:46,350,1,WOOHO -2018-11-18 20:50:47,351,1,WOOHO -2018-11-18 20:50:48,352,1,WOOHO -2018-11-18 20:50:49,355,1,WOOHO -2018-11-18 20:50:50,360,1,WOOHO -2018-11-18 20:50:51,363,1,WOOHO -2018-11-18 20:50:52,367,1,WOOHO -2018-11-18 20:50:53,370,1,WOOHO -2018-11-18 20:50:54,372,1,WOOHO -2018-11-18 20:50:55,378,1,WOOHO -2018-11-18 20:50:56,379,1,WOOHO -2018-11-18 20:50:57,384,1,WOOHO -2018-11-18 20:50:58,388,1,WOOHO -2018-11-18 20:50:59,389,1,WOOHO -2018-11-18 20:51:00,390,1,WOOHO -2018-11-18 20:51:01,391,1,WOOHO -2018-11-18 20:51:02,392,1,WOOHO -2018-11-18 20:51:03,395,1,WOOHO -2018-11-18 20:51:04,400,1,WOOHO -2018-11-18 20:51:05,405,1,WOOHO -2018-11-18 20:51:06,408,1,WOOHO -2018-11-18 20:51:07,412,1,WOOHO -2018-11-18 20:51:08,415,1,WOOHO -2018-11-18 20:51:09,420,1,WOOHO -2018-11-18 20:51:10,424,1,WOOHO -2018-11-18 20:51:11,429,1,WOOHO -2018-11-18 20:51:12,433,1,WOOHO -2018-11-18 20:51:13,435,1,WOOHO -2018-11-18 20:51:14,438,1,WOOHO -2018-11-18 20:51:15,442,1,WOOHO -2018-11-18 20:51:16,448,1,WOOHO -2018-11-18 20:51:17,451,1,WOOHO -2018-11-18 20:51:18,454,1,WOOHO -2018-11-18 20:51:19,458,1,WOOHO -2018-11-18 20:51:20,462,1,WOOHO -2018-11-18 20:51:21,467,1,WOOHO -2018-11-18 20:51:22,472,1,WOOHO -2018-11-18 20:51:23,478,1,WOOHO -2018-11-18 20:51:24,482,1,WOOHO -2018-11-18 20:51:25,484,1,WOOHO -2018-11-18 20:51:26,489,1,WOOHO -2018-11-18 20:51:27,492,1,WOOHO -2018-11-18 20:51:28,497,1,WOOHO -2018-11-18 20:51:29,501,1,WOOHO -2018-11-18 20:51:30,504,1,WOOHO