From ce2d942771800ce544d2ba7a921e9a8d4337691a Mon Sep 17 00:00:00 2001
From: manuel83 <cUrrent2015>
Date: Mon, 31 Dec 2018 00:22:00 +0100
Subject: [PATCH] loading extension from external python packages

---
 .idea/workspace.xml                  | 1249 +++++++++++---------------
 config/plugin_list.txt               |    3 +
 config/plugin_list.yaml              |    0
 core/controller/actor_controller.py  |   13 +-
 core/controller/config_controller.py |    2 +-
 core/controller/plugin_controller.py |   35 +-
 core/controller/sensor_controller.py |    1 -
 core/craftbeerpi.py                  |   89 +-
 core/database/model.py               |   53 +-
 core/database/orm_framework.py       |   17 +-
 core/eventbus.py                     |    8 +-
 core/http_endpoints/http_api.py      |    5 -
 core/http_endpoints/http_login.py    |    6 +-
 core/websocket.py                    |   29 +-
 craftbeerpi.db                       |  Bin 53248 -> 53248 bytes
 docs/_sources/standards.rst.txt      |    4 +-
 docs/index.html                      |    2 +-
 docs/standards.html                  |    6 +-
 docs_src/source/standards.rst        |    4 +-
 main2.py                             |   89 +-
 run.py                               |    1 -
 sensor_None.log                      |    0
 tests/test_app.py                    |    9 +-
 23 files changed, 633 insertions(+), 992 deletions(-)
 create mode 100644 config/plugin_list.txt
 delete mode 100644 config/plugin_list.yaml
 delete mode 100644 sensor_None.log

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 983b802..d8f6d31 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,50 +2,28 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment="Lots of changes">
-      <change afterPath="$PROJECT_DIR$/tests/test_config.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/craftbeerpi4.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/craftbeerpi4.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/config.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/config/config.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/api/__init__.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/api/actor.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/api/decorator.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/api/extension.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/api/kettle_logic.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/api/property.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/api/sensor.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/api/step.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/plugin_list.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/config/plugin_list.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core/controller/actor_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/actor_controller.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core/controller/config_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/config_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/controller/crud_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/crud_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/controller/kettle_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/kettle_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/controller/notification_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/notification_controller.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core/controller/plugin_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/plugin_controller.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core/controller/sensor_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/sensor_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/controller/step_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/step_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/controller/system_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/system_controller.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core/craftbeerpi.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/craftbeerpi.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/database/model.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/database/model.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core/database/orm_framework.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/database/orm_framework.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core/eventbus.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/eventbus.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/extension/comp/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/comp/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/extension/dummylogic/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/dummylogic/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/extension/dummysensor/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/dummysensor/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/extension/dummystep/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/dummystep/__init__.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core/http_endpoints/http_api.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/http_endpoints/http_api.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core/http_endpoints/http_login.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/http_endpoints/http_login.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/job/_scheduler.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/job/_scheduler.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/mqtt/mqtt_matcher.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/mqtt/mqtt_matcher.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/utils/encoder.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/utils/encoder.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/utils/utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/utils/utils.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core/websocket.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/websocket.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/craftbeerpi.db" beforeDir="false" afterPath="$PROJECT_DIR$/craftbeerpi.db" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs_src/source/actor.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/actor.rst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs_src/source/kettle_controller.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/kettle_controller.rst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs_src/source/properties.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/properties.rst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs_src/source/sensor.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/sensor.rst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs_src/source/step.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/step.rst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs/_sources/standards.rst.txt" beforeDir="false" afterPath="$PROJECT_DIR$/docs/_sources/standards.rst.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs/standards.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/standards.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs_src/source/standards.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/standards.rst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main2.py" beforeDir="false" afterPath="$PROJECT_DIR$/main2.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/run.py" beforeDir="false" afterPath="$PROJECT_DIR$/run.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sensor_None.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_app.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_app.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -54,14 +32,17 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/craftbeerpi4$main2.coverage" NAME="main2 Coverage Results" MODIFIED="1543663949310" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$main2.coverage" NAME="main2 Coverage Results" MODIFIED="1546124517142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$test_kettle.coverage" NAME="test kettle Coverage Results" MODIFIED="1546020780689" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_config_py.coverage" NAME="pytest in test_config.py Coverage Results" MODIFIED="1546038141204" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$test_app.coverage" NAME="test_app Coverage Results" MODIFIED="1546020826753" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1546034207962" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_config_py.coverage" NAME="pytest in test_config.py Coverage Results" MODIFIED="1546113553124" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1546115440541" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$test_app.coverage" NAME="test_app Coverage Results" MODIFIED="1546211352734" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1546211194972" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_kettle_KettleTestCase.coverage" NAME="pytest for test_kettle.KettleTestCase Coverage Results" MODIFIED="1546113667573" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$py_test_in_tests.coverage" NAME="py.test in tests Coverage Results" MODIFIED="1544486432317" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_config_KettleTestCase.coverage" NAME="pytest for test_config.KettleTestCase Coverage Results" MODIFIED="1546021043564" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_config_ConfigTestCase.coverage" NAME="pytest for test_config.ConfigTestCase Coverage Results" MODIFIED="1546024160487" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_tests_test_app.coverage" NAME="pytest for tests.test_app Coverage Results" MODIFIED="1546211815308" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
   <component name="DatabaseView">
     <option name="SHOW_INTERMEDIATE" value="true" />
@@ -92,35 +73,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/controller/config_controller.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="435">
-              <caret line="29" column="11" selection-start-line="29" selection-start-column="11" selection-end-line="29" selection-end-column="11" />
-              <folding>
-                <element signature="e#0#14#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/controller/crud_controller.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-152">
-              <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
-              <folding>
-                <element signature="e#0#13#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/core/craftbeerpi.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="202">
-              <caret line="264" selection-start-line="264" selection-end-line="264" />
+            <state relative-caret-position="308">
+              <caret line="201" lean-forward="true" selection-start-line="201" selection-end-line="201" />
               <folding>
                 <element signature="e#0#14#0" expanded="true" />
               </folding>
@@ -129,22 +86,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tests/test_app.py">
+        <entry file="file://$PROJECT_DIR$/core/eventbus.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="413">
-              <caret line="36" column="8" lean-forward="true" selection-start-line="36" selection-start-column="8" selection-end-line="37" selection-end-column="33" />
-              <folding>
-                <element signature="e#0#65#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/tests/test_config.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="411">
-              <caret line="48" column="33" lean-forward="true" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="33" />
+            <state relative-caret-position="391">
+              <caret line="106" selection-start-line="106" selection-end-line="106" />
               <folding>
                 <element signature="e#0#14#0" expanded="true" />
               </folding>
@@ -153,21 +98,26 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/config">
-          <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-            <state>
-              <filtering enabled="true" />
+        <entry file="file://$PROJECT_DIR$/core/__init__.py">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/controller/step_controller.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15">
+              <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/controller/actor_controller.py">
+        <entry file="file://$PROJECT_DIR$/core/controller/system_controller.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
+            <state relative-caret-position="391">
+              <caret line="39" column="30" selection-start-line="39" selection-start-column="30" selection-end-line="39" selection-end-column="30" />
               <folding>
-                <element signature="e#0#11#0" expanded="true" />
+                <element signature="e#0#15#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -176,8 +126,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_api.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="528">
-              <caret line="40" column="87" lean-forward="true" selection-start-line="40" selection-start-column="87" selection-end-line="40" selection-end-column="87" />
+            <state relative-caret-position="-1566">
+              <caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
               <folding>
                 <element signature="e#0#14#0" expanded="true" />
               </folding>
@@ -186,32 +136,46 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/utils/utils.py">
+        <entry file="file://$PROJECT_DIR$/core/database/orm_framework.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="209">
-              <caret line="29" column="14" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="14" />
+            <state relative-caret-position="60">
+              <caret line="4" selection-start-line="4" selection-end-line="4" selection-end-column="34" />
               <folding>
-                <element signature="e#0#25#0" expanded="true" />
+                <element signature="e#0#11#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/core/database/model.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <caret column="11" selection-start-column="11" selection-end-column="11" />
+              <folding>
+                <marker date="1546211974987" expanded="true" signature="1139:1179" ph="UPDATE missi... " />
+                <marker date="1546211974987" expanded="true" signature="1522:1574" ph="SELECT * FRO... missing_value" />
+                <marker date="1546211974987" expanded="true" signature="1964:2034" ph="UPDATE missi... " />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/database/model.py">
+        <entry file="file://$PROJECT_DIR$/core/controller/notification_controller.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="435">
-              <caret line="33" column="35" selection-start-line="33" selection-start-column="35" selection-end-line="33" selection-end-column="35" />
+            <state relative-caret-position="240">
+              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/controller/kettle_controller.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
               <folding>
-                <element signature="e#0#11#0" expanded="true" />
-                <marker date="1544981620597" expanded="true" signature="1131:1171" ph="UPDATE missi... " />
-                <marker date="1544981620597" expanded="true" signature="1508:1560" ph="SELECT * FRO... missing_value" />
-                <marker date="1544981620597" expanded="true" signature="1944:2014" ph="UPDATE missi... " />
-                <marker date="1544981620597" expanded="true" signature="2237:2272" ph="UPDATE missi... " />
-                <marker date="1544981620597" expanded="true" signature="2446:2487" ph="SELECT max(s... missing_value" />
-                <marker date="1544981620597" expanded="true" signature="2666:2678" ph="DELETE FROM " />
-                <marker date="1544981620597" expanded="true" signature="2847:2899" ph="SELECT * FRO... missing_value" />
-                <marker date="1544981620597" expanded="true" signature="3177:3247" ph="UPDATE missi... " />
+                <element signature="e#0#9#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -228,21 +192,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>@</find>
-      <find>@on</find>
-      <find>@on_</find>
-      <find>@on_e</find>
-      <find />
-      <find>c</find>
-      <find>cbp</find>
-      <find>cbpi.</find>
-      <find>cbpi.b</find>
-      <find>cbpi.bu</find>
-      <find>cbpi.bus</find>
-      <find>cbpi.bus.</find>
-      <find>cbpi.bus.f</find>
-      <find>cbpi.bus.fi</find>
-      <find>cbpi.bus.fire</find>
       <find>fire</find>
       <find>update_step_state</find>
       <find>schedul</find>
@@ -257,7 +206,22 @@
       <find>Prefx</find>
       <find>################</find>
       <find>defaultdict</find>
+      <find>types</find>
+      <find>modules</find>
+      <find>initializer</find>
+      <find>midd</find>
+      <find>Login</find>
+      <find>not fou</find>
+      <find>not f</find>
+      <find>not fou</find>
+      <find>not found</find>
+      <find>url_prefix</find>
+      <find>INIT ACTOR</find>
+      <find>auth</find>
+      <find>LIONGNNNNNNN</find>
       <find>print</find>
+      <find>register</find>
+      <find>TEST_DB</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -277,10 +241,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/core/extension/dummystep/config.yaml" />
-        <option value="$PROJECT_DIR$/core/extension/dummysensor/config.yaml" />
-        <option value="$PROJECT_DIR$/core/extension/dummylogic/config.yaml" />
-        <option value="$PROJECT_DIR$/core/extension/dummyactor/config.yaml" />
         <option value="$PROJECT_DIR$/core/extension/comp/config.yaml" />
         <option value="$PROJECT_DIR$/core/api/sensor.py" />
         <option value="$PROJECT_DIR$/core/api/kettle_logic.py" />
@@ -292,12 +252,8 @@
         <option value="$PROJECT_DIR$/core/api/extension.py" />
         <option value="$PROJECT_DIR$/tests/test_kettle.py" />
         <option value="$PROJECT_DIR$/core/api/step.py" />
-        <option value="$PROJECT_DIR$/core/database/model.py" />
         <option value="$PROJECT_DIR$/core/job/aiohttp.py" />
-        <option value="$PROJECT_DIR$/run.py" />
-        <option value="$PROJECT_DIR$/core/http_endpoints/http_api.py" />
         <option value="$PROJECT_DIR$/core/controller/notification_controller.py" />
-        <option value="$PROJECT_DIR$/core/http_endpoints/http_login.py" />
         <option value="$PROJECT_DIR$/docs_src/source/actor.rst" />
         <option value="$PROJECT_DIR$/docs_src/source/kettle_controller.rst" />
         <option value="$PROJECT_DIR$/docs_src/source/sensor.rst" />
@@ -309,33 +265,41 @@
         <option value="$PROJECT_DIR$/core/controller/system_controller.py" />
         <option value="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" />
         <option value="$PROJECT_DIR$/core/extension/comp/__init__.py" />
-        <option value="$PROJECT_DIR$/core/controller/sensor_controller.py" />
-        <option value="$PROJECT_DIR$/core/controller/plugin_controller.py" />
         <option value="$PROJECT_DIR$/core/extension/dummylogic/__init__.py" />
         <option value="$PROJECT_DIR$/core/extension/dummystep/__init__.py" />
         <option value="$PROJECT_DIR$/core/extension/dummysensor/__init__.py" />
         <option value="$PROJECT_DIR$/core/utils/utils.py" />
         <option value="$PROJECT_DIR$/core/controller/kettle_controller.py" />
-        <option value="$PROJECT_DIR$/core/controller/actor_controller.py" />
         <option value="$PROJECT_DIR$/core/mqtt/mqtt_matcher.py" />
         <option value="$PROJECT_DIR$/core/controller/crud_controller.py" />
         <option value="$PROJECT_DIR$/core/job/_scheduler.py" />
-        <option value="$PROJECT_DIR$/core/database/orm_framework.py" />
-        <option value="$PROJECT_DIR$/core/craftbeerpi.py" />
         <option value="$PROJECT_DIR$/core/eventbus.py" />
+        <option value="$PROJECT_DIR$/tests/test_config.py" />
+        <option value="$PROJECT_DIR$/core/controller/sensor_controller.py" />
+        <option value="$PROJECT_DIR$/core/http_endpoints/http_system.py" />
         <option value="$PROJECT_DIR$/core/websocket.py" />
+        <option value="$PROJECT_DIR$/core/http_endpoints/http_api.py" />
+        <option value="$PROJECT_DIR$/core/cbpieventbus.py" />
+        <option value="$PROJECT_DIR$/config/plugin_list.txt" />
+        <option value="$PROJECT_DIR$/main2.py" />
+        <option value="$PROJECT_DIR$/core/controller/config_controller.py" />
+        <option value="$PROJECT_DIR$/core/http_endpoints/http_login.py" />
         <option value="$PROJECT_DIR$/tests/test_app.py" />
         <option value="$APPLICATION_CONFIG_DIR$/consoles/.datagrid/cell" />
-        <option value="$PROJECT_DIR$/core/controller/config_controller.py" />
-        <option value="$PROJECT_DIR$/tests/test_config.py" />
+        <option value="$PROJECT_DIR$/run.py" />
+        <option value="$PROJECT_DIR$/core/controller/actor_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/plugin_controller.py" />
+        <option value="$PROJECT_DIR$/core/craftbeerpi.py" />
+        <option value="$PROJECT_DIR$/core/database/orm_framework.py" />
+        <option value="$PROJECT_DIR$/core/database/model.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="725" />
-    <option name="y" value="158" />
-    <option name="width" value="2037" />
-    <option name="height" value="1391" />
+    <option name="x" value="61" />
+    <option name="y" value="72" />
+    <option name="width" value="1492" />
+    <option name="height" value="910" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -343,7 +307,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -351,11 +314,6 @@
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="config" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
@@ -373,6 +331,21 @@
               <item name="core" type="462c0819:PsiDirectoryNode" />
               <item name="database" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="database" type="462c0819:PsiDirectoryNode" />
+              <item name="model.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="database" type="462c0819:PsiDirectoryNode" />
+              <item name="model.py" type="8704e2dd:PyFileNode" />
+              <item name="StepModel" type="dd8bbb05:PyElementNode" />
+            </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
@@ -389,194 +362,29 @@
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
               <item name="core" type="462c0819:PsiDirectoryNode" />
-              <item name="http_endpoints" type="462c0819:PsiDirectoryNode" />
-              <item name="http_api.py" type="8704e2dd:PyFileNode" />
+              <item name="job" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
               <item name="core" type="462c0819:PsiDirectoryNode" />
-              <item name="http_endpoints" type="462c0819:PsiDirectoryNode" />
-              <item name="http_api.py" type="8704e2dd:PyFileNode" />
-              <item name="HttpAPI" type="dd8bbb05:PyElementNode" />
+              <item name="mqtt" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
               <item name="core" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="core" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
-              <item name="utils.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="core" type="462c0819:PsiDirectoryNode" />
-              <item name="craftbeerpi.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="core" type="462c0819:PsiDirectoryNode" />
-              <item name="craftbeerpi.py" type="8704e2dd:PyFileNode" />
-              <item name="CraftBeerPi" type="dd8bbb05:PyElementNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="core" type="462c0819:PsiDirectoryNode" />
-              <item name="websocket.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="tests" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="tests" type="462c0819:PsiDirectoryNode" />
-              <item name="test_app.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="tests" type="462c0819:PsiDirectoryNode" />
-              <item name="test_config.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="tests" type="462c0819:PsiDirectoryNode" />
-              <item name="test_config.py" type="8704e2dd:PyFileNode" />
-              <item name="ConfigTestCase" type="dd8bbb05:PyElementNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="tests" type="462c0819:PsiDirectoryNode" />
-              <item name="test_kettle.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="main2.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="main2.py" type="8704e2dd:PyFileNode" />
-              <item name="Name" type="dd8bbb05:PyElementNode" />
+              <item name="sql" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
             </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-              <item name="web_urldispatcher.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-              <item name="web_urldispatcher.py" type="8704e2dd:PyFileNode" />
-              <item name="AbstractRoute" type="dd8bbb05:PyElementNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-              <item name="web_urldispatcher.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-              <item name="web_urldispatcher.py" type="8704e2dd:PyFileNode" />
-              <item name="AbstractRoute" type="dd8bbb05:PyElementNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="craftbeerpi4_api" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="craftbeerpi4_api" type="462c0819:PsiDirectoryNode" />
-              <item name="cbpi_api" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="craftbeerpi4_api" type="462c0819:PsiDirectoryNode" />
-              <item name="cbpi_api" type="462c0819:PsiDirectoryNode" />
-              <item name="config.py" type="8704e2dd:PyFileNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -616,7 +424,29 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python tests.pytest in test_config.py">
+  <component name="RunManager" selected="Python tests.pytest for tests.test_app">
+    <configuration name="main2" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="craftbeerpi4" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/main2.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <configuration name="run" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -701,28 +531,12 @@
       <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="py.test in tests" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
-      <module name="craftbeerpi4" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
     <configuration name="pytest for test_config.ConfigTestCase" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
       <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
@@ -733,7 +547,7 @@
       <option name="_new_targetType" value="&quot;PYTHON&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="pytest for test_config.KettleTestCase" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+    <configuration name="pytest for test_kettle.KettleTestCase" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
       <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -745,58 +559,58 @@
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_keywords" value="&quot;&quot;" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;test_config.KettleTestCase&quot;" />
+      <option name="_new_target" value="&quot;test_kettle.KettleTestCase&quot;" />
       <option name="_new_targetType" value="&quot;PYTHON&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="pytest in test_config.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+    <configuration name="pytest for tests.test_app" type="tests" factoryName="py.test" nameIsGenerated="true">
       <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
+      <option name="SDK_HOME" value="$USER_HOME$/cbp42/bin/python" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests/test_config.py&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
-    <configuration name="test kettle" type="tests" factoryName="Unittests">
-      <module name="craftbeerpi4" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="$USER_HOME$/cbpi41/bin/python" />
-      <option name="WORKING_DIRECTORY" value="" />
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_pattern" value="&quot;&quot;" />
+      <option name="_new_keywords" value="&quot;&quot;" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests/test_kettle.py&quot;" />
+      <option name="_new_target" value="&quot;tests.test_app&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration name="pytest in tests" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <module name="craftbeerpi4" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests&quot;" />
       <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
     <list>
       <item itemvalue="Python.test_app" />
       <item itemvalue="Python.run" />
-      <item itemvalue="Python tests.test kettle" />
-      <item itemvalue="Python tests.py.test in tests" />
-      <item itemvalue="Python tests.pytest in test_config.py" />
-      <item itemvalue="Python tests.pytest for test_config.KettleTestCase" />
+      <item itemvalue="Python.main2" />
+      <item itemvalue="Python tests.pytest for tests.test_app" />
       <item itemvalue="Python tests.pytest for test_config.ConfigTestCase" />
+      <item itemvalue="Python tests.pytest for test_kettle.KettleTestCase" />
+      <item itemvalue="Python tests.pytest in tests" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Python tests.pytest in test_config.py" />
         <item itemvalue="Python.run" />
+        <item itemvalue="Python.main2" />
+        <item itemvalue="Python tests.pytest in tests" />
+        <item itemvalue="Python tests.pytest for test_kettle.KettleTestCase" />
         <item itemvalue="Python tests.pytest for test_config.ConfigTestCase" />
-        <item itemvalue="Python tests.pytest for test_config.KettleTestCase" />
-        <item itemvalue="Python tests.py.test in tests" />
       </list>
     </recent_temporary>
   </component>
@@ -816,7 +630,8 @@
       <workItem from="1545649866457" duration="125000" />
       <workItem from="1545814324660" duration="436000" />
       <workItem from="1546003397332" duration="543000" />
-      <workItem from="1546006149688" duration="17935000" />
+      <workItem from="1546006149688" duration="24136000" />
+      <workItem from="1546201868140" duration="5324000" />
     </task>
     <task id="LOCAL-00001" summary="Lots of changes">
       <created>1541288846149</created>
@@ -836,39 +651,39 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="pytest_in_test_config_py - 2018.12.28 at 23h 54m 33s.xml">
-      <configuration name="pytest in test_config.py" configurationId="tests" />
+    <history-entry file="pytest_for_tests_test_app - 2018.12.30 at 22h 09m 11s.xml">
+      <configuration name="pytest for tests.test_app" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_test_config_py - 2018.12.28 at 23h 55m 04s.xml">
-      <configuration name="pytest in test_config.py" configurationId="tests" />
+    <history-entry file="pytest_for_tests_test_app - 2018.12.30 at 22h 09m 33s.xml">
+      <configuration name="pytest for tests.test_app" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_test_config_py - 2018.12.28 at 23h 55m 22s.xml">
-      <configuration name="pytest in test_config.py" configurationId="tests" />
+    <history-entry file="pytest_for_tests_test_app - 2018.12.30 at 22h 09m 54s.xml">
+      <configuration name="pytest for tests.test_app" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_test_config_py - 2018.12.28 at 23h 55m 38s.xml">
-      <configuration name="pytest in test_config.py" configurationId="tests" />
+    <history-entry file="pytest_for_tests_test_app - 2018.12.30 at 22h 10m 43s.xml">
+      <configuration name="pytest for tests.test_app" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_test_config_py - 2018.12.28 at 23h 57m 43s.xml">
-      <configuration name="pytest in test_config.py" configurationId="tests" />
+    <history-entry file="pytest_for_tests_test_app - 2018.12.30 at 23h 31m 06s.xml">
+      <configuration name="pytest for tests.test_app" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_test_config_py - 2018.12.29 at 00h 01m 03s.xml">
-      <configuration name="pytest in test_config.py" configurationId="tests" />
+    <history-entry file="pytest_for_tests_test_app - 2018.12.30 at 23h 32m 07s.xml">
+      <configuration name="pytest for tests.test_app" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_test_config_py - 2018.12.29 at 00h 01m 20s.xml">
-      <configuration name="pytest in test_config.py" configurationId="tests" />
+    <history-entry file="pytest_for_tests_test_app - 2018.12.30 at 23h 32m 27s.xml">
+      <configuration name="pytest for tests.test_app" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_test_config_py - 2018.12.29 at 00h 01m 39s.xml">
-      <configuration name="pytest in test_config.py" configurationId="tests" />
+    <history-entry file="pytest_for_tests_test_app - 2018.12.30 at 23h 32m 39s.xml">
+      <configuration name="pytest for tests.test_app" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_test_config_py - 2018.12.29 at 00h 02m 05s.xml">
-      <configuration name="pytest in test_config.py" configurationId="tests" />
+    <history-entry file="pytest_for_tests_test_app - 2018.12.31 at 00h 09m 17s.xml">
+      <configuration name="pytest for tests.test_app" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_test_config_py - 2018.12.29 at 00h 02m 26s.xml">
-      <configuration name="pytest in test_config.py" configurationId="tests" />
+    <history-entry file="pytest_for_tests_test_app - 2018.12.31 at 00h 16m 56s.xml">
+      <configuration name="pytest for tests.test_app" configurationId="tests" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="31122000" />
+    <option name="totallyTimeSpent" value="42647000" />
   </component>
   <component name="TodoView" selected-index="4">
     <todo-panel id="selected-file">
@@ -880,20 +695,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="725" y="158" width="2037" height="1391" extended-state="0" />
+    <frame x="61" y="72" width="1492" height="910" extended-state="0" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1904762" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26551723" />
       <window_info id="Structure" order="1" weight="0.24957556" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Event Log" order="0" sideWeight="0.2720238" side_tool="true" weight="0.43208432" />
       <window_info anchor="bottom" id="Version Control" order="1" weight="0.32762837" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.7279762" visible="true" weight="0.49730563" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.7279762" visible="true" weight="0.45476773" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39731053" />
       <window_info anchor="bottom" id="Python Console" order="4" weight="0.3290398" />
       <window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49761903" weight="0.29946113" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3286945" />
       <window_info anchor="bottom" id="Message" order="7" />
-      <window_info anchor="bottom" id="Find" order="8" weight="0.3256617" />
+      <window_info anchor="bottom" id="Find" order="8" weight="0.32518336" />
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
       <window_info anchor="bottom" id="Thumbnails" order="11" weight="0.22666667" />
@@ -901,7 +717,7 @@
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Database Console" order="14" weight="0.32885087" />
       <window_info anchor="right" id="Data View" order="0" />
-      <window_info anchor="right" id="Database" order="1" visible="true" weight="0.14135338" />
+      <window_info anchor="right" id="Database" order="1" visible="true" weight="0.19448276" />
       <window_info anchor="right" id="Commander" order="2" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" />
@@ -934,6 +750,11 @@
           <url>file://$PROJECT_DIR$/core/eventbus.py</url>
           <option name="timeStamp" value="22" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/core/database/model.py</url>
+          <line>4</line>
+          <option name="timeStamp" value="23" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -950,335 +771,22 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/core/api/__init__.py" />
-    <entry file="file://$PROJECT_DIR$/core/extension/dummylogic/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/__init__.py">
+    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_system.py" />
+    <entry file="file://$PROJECT_DIR$/core/mqtt/mqtt_matcher.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/run.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/kettle_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/comp/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/notification_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="22" selection-start-column="22" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/build/html/install.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_login.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/actor.rst">
-      <provider selected="true" editor-type-id="restructured-text-editor" />
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/kettle_controller.rst">
-      <provider selected="true" editor-type-id="restructured-text-editor" />
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/standards.rst">
-      <provider selected="true" editor-type-id="restructured-text-editor" />
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="570">
-          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/step.rst">
-      <provider selected="true" editor-type-id="restructured-text-editor" />
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="31" column="24" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/properties.rst">
-      <provider selected="true" editor-type-id="restructured-text-editor" />
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" column="23" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/sensor.rst">
-      <provider selected="true" editor-type-id="restructured-text-editor" />
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="9" selection-start-line="1" selection-start-column="9" selection-end-line="1" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/dummyactor/config.yaml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
-        <state split_layout="SPLIT">
-          <first_editor />
-          <second_editor>
-            <js_state />
-          </second_editor>
-        </state>
-      </provider>
-      <provider editor-type-id="text-editor" />
-    </entry>
     <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor" />
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp/test_utils.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-322">
-          <caret line="316" column="6" selection-start-line="316" selection-start-column="6" selection-end-line="316" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/cbpi_api/actor.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/dummysensor/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="31" column="26" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="26" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/sensor">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/asyncio/events.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="279" column="8" selection-start-line="279" selection-start-column="8" selection-end-line="279" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/json/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="305">
-          <caret line="182" column="4" selection-start-line="182" selection-start-column="4" selection-end-line="182" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/utils/encoder.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/sensor_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="24" column="4" selection-start-line="24" selection-start-column="4" selection-end-line="27" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_kettle.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="11" lean-forward="true" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/plugin_list.yaml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/config.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="6" lean-forward="true" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/system_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-39">
-          <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/step_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/cbpi_api/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/dummystep/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" selection-start-line="2" selection-end-line="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/dummyactor/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-99">
-          <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/database/orm_framework.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="86" column="12" selection-start-line="86" selection-start-column="12" selection-end-line="87" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../craftbeerpi4_api/cbpi_api/config.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp/web_urldispatcher.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="544">
-          <caret line="118" column="47" lean-forward="true" selection-start-line="118" selection-start-column="47" selection-end-line="118" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/main2.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-69">
-          <caret line="51" column="24" lean-forward="true" selection-start-line="51" selection-end-line="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/plugin_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="16" selection-start-line="16" selection-end-line="16" />
-          <folding>
-            <element signature="e#0#10#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/eventbus.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="106" column="19" selection-start-line="106" selection-start-column="19" selection-end-line="106" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/websocket.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="22" column="42" selection-start-line="22" selection-start-column="42" selection-end-line="22" selection-end-column="42" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/database/model.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="435">
-          <caret line="33" column="35" selection-start-line="33" selection-start-column="35" selection-end-line="33" selection-end-column="35" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-            <marker date="1544981620597" expanded="true" signature="1131:1171" ph="UPDATE missi... " />
-            <marker date="1544981620597" expanded="true" signature="1508:1560" ph="SELECT * FRO... missing_value" />
-            <marker date="1544981620597" expanded="true" signature="1944:2014" ph="UPDATE missi... " />
-            <marker date="1544981620597" expanded="true" signature="2237:2272" ph="UPDATE missi... " />
-            <marker date="1544981620597" expanded="true" signature="2446:2487" ph="SELECT max(s... missing_value" />
-            <marker date="1544981620597" expanded="true" signature="2666:2678" ph="DELETE FROM " />
-            <marker date="1544981620597" expanded="true" signature="2847:2899" ph="SELECT * FRO... missing_value" />
-            <marker date="1544981620597" expanded="true" signature="3177:3247" ph="UPDATE missi... " />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/craftbeerpi.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="264" selection-start-line="264" selection-end-line="264" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_app.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="413">
-          <caret line="36" column="8" lean-forward="true" selection-start-line="36" selection-start-column="8" selection-end-line="37" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#65#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/config">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
+        <state relative-caret-position="60">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
         </state>
       </provider>
     </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/config" />
     <entry file="file://$PROJECT_DIR$/core/controller/crud_controller.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-152">
+        <state relative-caret-position="15">
           <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
           <folding>
             <element signature="e#0#13#0" expanded="true" />
@@ -1286,25 +794,14 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/actor_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/tests/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_api.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
-          <caret line="40" column="87" lean-forward="true" selection-start-line="40" selection-start-column="87" selection-end-line="40" selection-end-column="87" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/sensor_None.log">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.nojekyll">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/core/utils/utils.py">
       <provider selected="true" editor-type-id="text-editor">
@@ -1316,10 +813,72 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/core/job/aiohttp.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#27#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/job/_scheduler.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1873">
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../craftbeerpi4_api/cbpi_api/extension.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp/web.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="42" column="4" selection-start-line="42" selection-start-column="4" selection-end-line="42" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/utils/encoder.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="20" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/http_endpoints/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/core/controller/config_controller.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="435">
-          <caret line="29" column="11" selection-start-line="29" selection-start-column="11" selection-end-line="29" selection-end-column="11" />
+        <state relative-caret-position="540">
+          <caret line="45" column="14" selection-start-line="45" selection-start-column="14" selection-end-line="45" selection-end-column="14" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/job/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/plugin_list.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/test_kettle.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
@@ -1328,7 +887,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/tests/test_config.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="411">
+        <state relative-caret-position="630">
           <caret line="48" column="33" lean-forward="true" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="33" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
@@ -1336,5 +895,245 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_login.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="353">
+          <caret line="35" column="29" selection-start-line="35" selection-start-column="29" selection-end-line="35" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/test_app.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="245">
+          <caret line="30" selection-start-line="30" selection-end-line="30" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/actor_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="77" column="11" selection-start-line="77" selection-start-column="11" selection-end-line="77" selection-end-column="11" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/extension/comp/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/config.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="14" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/extension/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/plugin_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="194">
+          <caret line="72" selection-start-line="72" selection-end-line="72" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/run.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="20" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/requirements.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-464" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/websocket.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="79" column="17" selection-start-line="79" selection-start-column="17" selection-end-line="79" selection-end-column="17" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/craftbeerpi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="201" lean-forward="true" selection-start-line="201" selection-end-line="201" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/eventbus.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="106" selection-start-line="106" selection-end-line="106" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/step_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/system_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="39" column="30" selection-start-line="39" selection-start-column="30" selection-end-line="39" selection-end-column="30" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/notification_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/kettle_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#9#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_api.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1566">
+          <caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/database/orm_framework.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" selection-start-line="4" selection-end-line="4" selection-end-column="34" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/database/model.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="11" selection-start-column="11" selection-end-column="11" />
+          <folding>
+            <marker date="1546211974987" expanded="true" signature="1139:1179" ph="UPDATE missi... " />
+            <marker date="1546211974987" expanded="true" signature="1522:1574" ph="SELECT * FRO... missing_value" />
+            <marker date="1546211974987" expanded="true" signature="1964:2034" ph="UPDATE missi... " />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/config/plugin_list.txt b/config/plugin_list.txt
new file mode 100644
index 0000000..c824f34
--- /dev/null
+++ b/config/plugin_list.txt
@@ -0,0 +1,3 @@
+cbpi-actor
+cbpi-actor
+cbpi-actor
\ No newline at end of file
diff --git a/config/plugin_list.yaml b/config/plugin_list.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/core/controller/actor_controller.py b/core/controller/actor_controller.py
index 72da40e..795e736 100644
--- a/core/controller/actor_controller.py
+++ b/core/controller/actor_controller.py
@@ -9,10 +9,11 @@ from core.database.model import ActorModel
 from core.http_endpoints.http_api import HttpAPI
 from utils.encoder import ComplexEncoder
 
+auth = True
 
 class ActorHttp(HttpAPI):
 
-    @request_mapping(path="/{id:\d+}/on", auth_required=False)
+    @request_mapping(path="/{id:\d+}/on", auth_required=auth)
     async def http_on(self, request) -> web.Response:
         """
         :param request: 
@@ -27,7 +28,7 @@ class ActorHttp(HttpAPI):
         return web.Response(status=204)
 
 
-    @request_mapping(path="/{id:\d+}/off", auth_required=False)
+    @request_mapping(path="/{id:\d+}/off", auth_required=auth)
     async def http_off(self, request) -> web.Response:
         """
         :param request: 
@@ -37,7 +38,7 @@ class ActorHttp(HttpAPI):
         await self.cbpi.bus.fire(topic="actor/%s/off" % id, id=id)
         return web.Response(status=204)
 
-    @request_mapping(path="/{id:\d+}/toggle", auth_required=False)
+    @request_mapping(path="/{id:\d+}/toggle", auth_required=auth)
     async def http_toggle(self, request) -> web.Response:
         """
         :param request: 
@@ -78,6 +79,7 @@ class ActorController(ActorHttp, CRUDController):
         await super(ActorController, self).init()
 
         for id, value in self.cache.items():
+
             await self._init_actor(value)
 
     async def _init_actor(self, actor):
@@ -85,10 +87,13 @@ class ActorController(ActorHttp, CRUDController):
             cfg = actor.config.copy()
             cfg.update(dict(cbpi=self.cbpi, id=id, name=actor.name))
             clazz = self.types[actor.type]["class"];
-
             self.cache[actor.id].instance = clazz(**cfg)
             self.cache[actor.id].instance.init()
             await self.cbpi.bus.fire(topic="actor/%s/initialized" % actor.id, id=actor.id)
+        else:
+
+            self.logger.error("Actor type '%s' not found (Available Actor Types: %s)" % (actor.type, ', '.join(self.types.keys())))
+
 
 
     async def _stop_actor(self, actor):
diff --git a/core/controller/config_controller.py b/core/controller/config_controller.py
index 5baa859..5551978 100644
--- a/core/controller/config_controller.py
+++ b/core/controller/config_controller.py
@@ -51,7 +51,7 @@ class ConfigController(ConfigHTTPController):
             self.cache[value.name] = value
 
 
-    async def get(self, name, default=None):
+    def get(self, name, default=None):
         self.logger.info("GET CONFIG VALUE %s (default %s)" % (name,default))
         if name in self.cache and self.cache[name].value is not None:
             return self.cache[name].value
diff --git a/core/controller/plugin_controller.py b/core/controller/plugin_controller.py
index bfc66d4..6c815fb 100644
--- a/core/controller/plugin_controller.py
+++ b/core/controller/plugin_controller.py
@@ -1,16 +1,12 @@
-import imp
-import importlib
 import logging
 import os
-import sys
 from importlib import import_module
-from pprint import pprint
 
 import aiohttp
 import yaml
 from aiohttp import web
-
 from cbpi_api import *
+
 from core.utils.utils import load_config, json_dumps
 
 logger = logging.getLogger(__name__)
@@ -42,20 +38,17 @@ class PluginController():
             if os.path.isdir("./core/extension/" + filename) is False or filename == "__pycache__":
                 continue
             try:
-
                 logger.info("Trying to load plugin %s" % filename)
-
                 data = load_config("./core/extension/%s/config.yaml" % filename)
 
-
                 if(data.get("version") == 4):
 
                     self.modules[filename] = import_module("core.extension.%s" % (filename))
                     self.modules[filename].setup(self.cbpi)
+
                     logger.info("Plugin %s loaded successful" % filename)
                 else:
-                    logger.warning("Plguin %s is not supporting version 4" % filename)
-
+                    logger.warning("Plugin %s is not supporting version 4" % filename)
 
 
             except Exception as e:
@@ -63,14 +56,25 @@ class PluginController():
 
     def load_plugins_from_evn(self):
 
+        plugins = []
 
-        plugins = ["cbpi-actor"]
-
+        with open('./config/plugin_list.txt') as f:
+            plugins = f.read().splitlines()
+            plugins = list(set(plugins))
 
         for p in plugins:
+            logger.debug("Load Plugin %s" % p)
+            try:
+                logger.info("Try to load plugin:  %s " % p)
+                self.modules[p] = import_module(p)
+                self.modules[p].setup(self.cbpi)
 
-            self.modules[p] = import_module(p)
-            self.modules[p].setup(self.cbpi)
+
+
+                logger.info("Plugin  %s loaded successfully" % p)
+            except Exception as e:
+                logger.error("FAILED to load plugin %s " % p)
+                logger.error(e)
 
 
     @request_mapping(path="/plugins", method="GET", auth_required=False)
@@ -99,11 +103,10 @@ class PluginController():
         :param clazz: actor class
         :return: None
         '''
-
+        logger.info("Register %s Class %s" % (name, clazz.__name__))
         if issubclass(clazz, CBPiActor):
             self.cbpi.actor.types[name] = {"class": clazz, "config": self._parse_props(clazz)}
 
-
         if issubclass(clazz, CBPiSensor):
             self.cbpi.sensor.types[name] = {"class": clazz, "config": self._parse_props(clazz)}
 
diff --git a/core/controller/sensor_controller.py b/core/controller/sensor_controller.py
index e677813..6be6b91 100644
--- a/core/controller/sensor_controller.py
+++ b/core/controller/sensor_controller.py
@@ -48,5 +48,4 @@ class SensorController(CRUDController, HttpAPI):
 
 
     async def get_value(self, id):
-
         return self.cache[id].instance.value
\ No newline at end of file
diff --git a/core/craftbeerpi.py b/core/craftbeerpi.py
index a8fc104..9211a10 100644
--- a/core/craftbeerpi.py
+++ b/core/craftbeerpi.py
@@ -22,7 +22,7 @@ from core.controller.plugin_controller import PluginController
 from core.controller.sensor_controller import SensorController
 from core.controller.system_controller import SystemController
 from core.database.model import DBModel
-from core.eventbus import EventBus
+from core.eventbus import CBPiEventBus
 from core.http_endpoints.http_login import Login
 from core.utils import *
 from core.websocket import WebSocket
@@ -50,7 +50,7 @@ class CraftBeerPi():
 
         logger.info("Init CraftBeerPI")
         policy = auth.SessionTktAuthentication(urandom(32), 60, include_ip=True)
-        middlewares = [session_middleware(EncryptedCookieStorage(urandom(32))), auth.auth_middleware(policy)]
+        middlewares = [web.normalize_path_middleware(), session_middleware(EncryptedCookieStorage(urandom(32))), auth.auth_middleware(policy)]
         self.app = web.Application(middlewares=middlewares)
         self.initializer = []
         self.shutdown = False
@@ -65,7 +65,7 @@ class CraftBeerPi():
         setup(self.app, self)
 
 
-        self.bus = EventBus(self.app.loop, self)
+        self.bus = CBPiEventBus(self.app.loop, self)
         self.ws = WebSocket(self)
         self.actor = ActorController(self)
         self.sensor = SensorController(self)
@@ -75,14 +75,7 @@ class CraftBeerPi():
         self.kettle = KettleController(self)
         self.step = StepController(self)
         self.notification = NotificationController(self)
-
-
-
-
         self.login = Login(self)
-
-        self.plugin.load_plugins()
-        self.plugin.load_plugins_from_evn()
         self.register_events(self.ws)
 
 
@@ -202,9 +195,11 @@ class CraftBeerPi():
             sub = web.Application()
             sub.add_routes(routes)
             if static is not None:
-                sub.add_routes([web.static('/static', static, show_index=True)])
+                sub.add_routes([web.static('/static', static, show_index=False)])
             self.app.add_subapp(url_prefix, sub)
         else:
+
+
             self.app.add_routes(routes)
 
 
@@ -249,53 +244,43 @@ class CraftBeerPi():
 
 
 
+        #async def init_database(app):
+
+
+
+
+        #self.app.on_startup.append(call_initializer)
+
+    async def call_initializer(self, app):
+        self.initializer = sorted(self.initializer, key=lambda k: k['order'])
+        for i in self.initializer:
+            logger.info("CALL INITIALIZER %s - %s " % (i["name"], i["method"].__name__))
+            await i["method"]()
+
+    def _print_logo(self):
         from pyfiglet import Figlet
         f = Figlet(font='big')
-        print("")
-        print(f.renderText("%s %s" % (self.config.get("name"), self.config.get("version"))))
-        print("")
-        async def init_database(app):
-            await DBModel.test_connection()
+        logger.info("\n%s" % f.renderText("%s %s" % (self.config.get("name"), self.config.get("version"))))
 
-        async def init_controller(app):
-            await self.sensor.init()
-            await self.step.init()
-            await self.actor.init()
-            await self.kettle.init()
-            await self.config2.init()
+    async def init_serivces(self):
 
+        self._print_logo()
+        await DBModel.test_connection()
+        await self.config2.init()
+        self.plugin.load_plugins()
+        self.plugin.load_plugins_from_evn()
+        await self.sensor.init()
+        await self.step.init()
+        await self.actor.init()
+        await self.kettle.init()
+        await self.call_initializer(self.app)
 
-            print(self.sensor.info())
-
-            print(self.actor.info())
-            import pprint
-            #pprint.pprint(self.bus.dump())
-
-
-        async def load_plugins(app):
-            #await PluginController.load_plugin_list()
-            #self.plugin.load_plugins()
-
-
-
-            pass
-
-        async def call_initializer(app):
-
-            self.initializer = sorted(self.initializer, key=lambda k: k['order'])
-            for i in self.initializer:
-                logger.info("CALL INITIALIZER %s - %s " % (i["name"], i["method"].__name__))
-
-                await i["method"]()
-
-
-        self.app.on_startup.append(init_database)
-        self.app.on_startup.append(call_initializer)
-
-        self.app.on_startup.append(load_plugins)
-        self.app.on_startup.append(init_controller)
+        logger.info(self.sensor.info())
+        logger.info(self.actor.info())
 
         self._swagger_setup()
 
+        return self.app
+
     def start(self):
-        web.run_app(self.app, port=self.config.get("port", 8080))
+        web.run_app(self.init_serivces(), port=self.config.get("port", 8080))
diff --git a/core/database/model.py b/core/database/model.py
index c2c79b0..13a77d8 100644
--- a/core/database/model.py
+++ b/core/database/model.py
@@ -1,9 +1,7 @@
 import json
-
 import aiosqlite
-
 from core.database.orm_framework import DBModel
-TEST_DB = "./craftbeerpi.db"
+DATABASE_FILE = "./craftbeerpi.db"
 
 class ActorModel(DBModel):
     __fields__ = ["name", "type", "config"]
@@ -11,8 +9,6 @@ class ActorModel(DBModel):
     __json_fields__ = ["config"]
 
 
-
-
 class SensorModel(DBModel):
     __fields__ = ["name", "type", "config"]
     __table_name__ = "sensor"
@@ -37,7 +33,7 @@ class StepModel(DBModel):
 
     @classmethod
     async def update_step_state(cls, step_id, state):
-        async with aiosqlite.connect(TEST_DB) as db:
+        async with aiosqlite.connect(DATABASE_FILE) as db:
             cursor = await db.execute("UPDATE %s SET stepstate = ? WHERE id = ?" % cls.__table_name__, (json.dumps(state), step_id))
             await db.commit()
 
@@ -45,7 +41,7 @@ class StepModel(DBModel):
     async def get_by_state(cls, state, order=True):
 
 
-        async with aiosqlite.connect(TEST_DB) as db:
+        async with aiosqlite.connect(DATABASE_FILE) as db:
             db.row_factory = aiosqlite.Row
             db.row_factory = DBModel.dict_factory
             async with db.execute("SELECT * FROM %s WHERE state = ? ORDER BY %s.'order'" %  (cls.__table_name__, cls.__table_name__,), state) as cursor:
@@ -57,48 +53,7 @@ class StepModel(DBModel):
 
     @classmethod
     async def reset_all_steps(cls):
-        async with aiosqlite.connect(TEST_DB) as db:
+        async with aiosqlite.connect(DATABASE_FILE) as db:
             cursor = await db.execute("UPDATE %s SET state = 'I', stepstate = NULL , start = NULL, end = NULL " % cls.__table_name__)
             await db.commit()
 
-        
-
-    '''
-    @classmethod
-    def sort(cls, new_order):
-        cur = get_db().cursor()
-        for key, value in new_order.items():
-            cur.execute("UPDATE %s SET '%s' = ? WHERE id = ?" % (cls.__table_name__, "order"), (value, key))
-        get_db().commit()
-
-    @classmethod
-    def get_max_order(cls):
-        cur = get_db().cursor()
-        cur.execute("SELECT max(step.'order') as 'order' FROM %s" % cls.__table_name__)
-        r = cur.fetchone()
-        return r.get("order")
-
-    @classmethod
-    def delete_all(cls):
-        cur = get_db().cursor()
-        cur.execute("DELETE FROM %s" % cls.__table_name__)
-        get_db().commit()
-
-    @classmethod
-    def get_by_state(cls, state, order=True):
-        cur = get_db().cursor()
-        cur.execute("SELECT * FROM %s WHERE state = ? ORDER BY %s.'order'" % (cls.__table_name__, cls.__table_name__,), state)
-        r = cur.fetchone()
-        if r is not None:
-            return cls(r)
-        else:
-            return None
-
-    
-
-    @classmethod
-    def reset_all_steps(cls):
-        cur = get_db().cursor()
-        cur.execute("UPDATE %s SET state = 'I', stepstate = NULL , start = NULL, end = NULL " % cls.__table_name__)
-        get_db().commit()
-    '''
\ No newline at end of file
diff --git a/core/database/orm_framework.py b/core/database/orm_framework.py
index e381269..e8a199c 100644
--- a/core/database/orm_framework.py
+++ b/core/database/orm_framework.py
@@ -1,10 +1,8 @@
 import json
-
 import aiosqlite
 import os
-# Thats the name of the database file
-TEST_DB = "./craftbeerpi.db"
 
+DATABASE_FILE = "./craftbeerpi.db"
 
 
 class DBModel(object):
@@ -36,7 +34,7 @@ class DBModel(object):
     @classmethod
     async def test_connection(self):
 
-        async with aiosqlite.connect(TEST_DB) as db:
+        async with aiosqlite.connect(DATABASE_FILE) as db:
             assert isinstance(db, aiosqlite.Connection)
             this_directory = os.path.dirname(__file__)
             qry = open(os.path.join(this_directory, '../sql/create_table_user.sql'), 'r').read()
@@ -49,7 +47,7 @@ class DBModel(object):
             result = []
         else:
             result = {}
-        async with aiosqlite.connect(TEST_DB) as db:
+        async with aiosqlite.connect(DATABASE_FILE) as db:
 
             if cls.__order_by__ is not None:
                 sql = "SELECT * FROM %s ORDER BY %s.'%s'" % (cls.__table_name__, cls.__table_name__, cls.__order_by__)
@@ -71,7 +69,7 @@ class DBModel(object):
 
     @classmethod
     async def get_one(cls, id):
-        async with aiosqlite.connect(TEST_DB) as db:
+        async with aiosqlite.connect(DATABASE_FILE) as db:
             db.row_factory = aiosqlite.Row
             db.row_factory = DBModel.dict_factory
             async with db.execute("SELECT * FROM %s WHERE %s = ?" % (cls.__table_name__, cls.__priamry_key__), (id,)) as cursor:
@@ -83,14 +81,14 @@ class DBModel(object):
 
     @classmethod
     async def delete(cls, id):
-        async with aiosqlite.connect(TEST_DB) as db:
+        async with aiosqlite.connect(DATABASE_FILE) as db:
             await db.execute("DELETE FROM %s WHERE %s = ? " % (cls.__table_name__, cls.__priamry_key__), (id,))
             await db.commit()
 
     @classmethod
     async def insert(cls, **kwargs):
 
-        async with aiosqlite.connect(TEST_DB) as db:
+        async with aiosqlite.connect(DATABASE_FILE) as db:
             if cls.__priamry_key__ is not None and cls.__priamry_key__ in kwargs:
                 query = "INSERT INTO %s (%s, %s) VALUES (?, %s)" % (
                     cls.__table_name__,
@@ -129,7 +127,7 @@ class DBModel(object):
 
     @classmethod
     async def update(cls, **kwargs):
-        async with aiosqlite.connect(TEST_DB) as db:
+        async with aiosqlite.connect(DATABASE_FILE) as db:
             query = 'UPDATE %s SET %s WHERE %s = ?' % (cls.__table_name__, ', '.join("'%s' = ?" % str(x) for x in cls.__fields__), cls.__priamry_key__)
 
             data = ()
@@ -150,4 +148,3 @@ class DBModel(object):
         for idx, col in enumerate(cursor.description):
             d[col[0]] = row[idx]
         return d
-
diff --git a/core/eventbus.py b/core/eventbus.py
index b16d5f1..2c81126 100644
--- a/core/eventbus.py
+++ b/core/eventbus.py
@@ -3,7 +3,7 @@ import inspect
 import logging
 
 
-class EventBus(object):
+class CBPiEventBus(object):
     class Node(object):
         __slots__ = '_children', '_content'
 
@@ -33,9 +33,9 @@ class EventBus(object):
             self.timeout = timeout
             for key, value in results.items():
                 if value.done() is True:
-                    self.results[key] = EventBus.Result(value.result(), True)
+                    self.results[key] = CBPiEventBus.Result(value.result(), True)
                 else:
-                    self.results[key] = EventBus.Result(None, False)
+                    self.results[key] = CBPiEventBus.Result(None, False)
 
 
 
@@ -104,7 +104,7 @@ class EventBus(object):
         self.loop.create_task(self.fire(topic=topic, timeout=timeout, **kwargs))
 
     async def fire(self, topic: str, timeout=1, **kwargs):
-        print("FIRE")
+
         futures = {}
 
         async def wait(futures):
diff --git a/core/http_endpoints/http_api.py b/core/http_endpoints/http_api.py
index 72755ca..653f683 100644
--- a/core/http_endpoints/http_api.py
+++ b/core/http_endpoints/http_api.py
@@ -1,13 +1,8 @@
 import logging
-
 from aiohttp import web
-
-
 from cbpi_api import *
-
 from core.utils.utils import json_dumps
 
-
 class HttpAPI():
     def __init__(self, cbpi):
         self.logger = logging.getLogger(__name__)
diff --git a/core/http_endpoints/http_login.py b/core/http_endpoints/http_login.py
index df3a73c..d030f2c 100644
--- a/core/http_endpoints/http_login.py
+++ b/core/http_endpoints/http_login.py
@@ -20,12 +20,16 @@ class Login():
 
     @request_mapping(path="/login",name="Login", method="POST", auth_required=False)
     async def login_view(self, request):
+
+        print("TRY LOGIN")
         params = await request.post()
 
 
         user = params.get('username', None)
+        password = params.get('password', None)
+        print("UUSEr", user, password, str(self.db[user]))
         if (user in self.db and
-            params.get('password', None) == self.db[user]):
+            params.get('password', None) == str(self.db[user])):
 
             # User is in our database, remember their login details
             await auth.remember(request, user)
diff --git a/core/websocket.py b/core/websocket.py
index 53bf6ed..0f7b7da 100644
--- a/core/websocket.py
+++ b/core/websocket.py
@@ -77,31 +77,4 @@ class WebSocket:
 
         self.logger.info("Web Socket Close")
 
-        return ws
-
-'''
-async def websocket_handler(request):
-    ws = web.WebSocketResponse()
-    await ws.prepare(request)
-
-    _ws.append(ws)
-
-    c = len(_ws) - 1
-
-    async for msg in ws:
-
-        if msg.type == aiohttp.WSMsgType.TEXT:
-            if msg.data == 'close':
-                await ws.close()
-            else:
-
-                await ws.send_str(msg.data)
-        elif msg.type == aiohttp.WSMsgType.ERROR:
-            print('ws connection closed with exception %s' %
-                  ws.exception())
-
-    del _ws[c]
-    print('websocket connection closed')
-
-    return ws
-'''
\ No newline at end of file
+        return ws
\ No newline at end of file
diff --git a/craftbeerpi.db b/craftbeerpi.db
index d697c7ac4f908b4df004794f9cd2fd204264ebfb..34c4f757d2b12c4643529355c4be5dddb5700522 100644
GIT binary patch
delta 1073
zcmZozz}&Ead4d!Zv&%#oCpKmm20d2CjVW{W>-irsF!9f0;Gf5TfFpqY6%a0?CS+D(
zR${sbgtLG!3=@W63Q;byabgoAlS10$3w8=j3XC9%h5r$++9YE+Cg!xs>+BR6lfiOO
zP9j(ZhaO83NCk)9<OS9WOe|$!g|T3TP);;5ClacQ(FmxEg+q@~0IC~gekfQa&?pcm
z7?~4@%<%_v*rtJ%`66??kvX0q4#)~@R=I*zLalN}<~SmA?2$RPAPx&h5rYfZ%|&4Q
zt-yl(kJ$Y{g8Yxbg63dtoX5Z%Q)G@YGRF|AmrVu~82pb|e}T;4x(3#!3swo`Xd`np
zq1qrG<9`GRL#WlNV3kmgGBQUInIjM8@O%SXC5z0FM&?L@I6#+SwMrDM5^9w&GDi@Z
z!w=zzfvw_2;!N(gQ)J=?i8}$UU^oK_1cp_JfSep|4^;7J@;-Z&$(QWpm=u_R+Lig`
zM5V<TSs6t6RYOvXOAI%EvFB6ZJIBDnZ^FpGia(6sgui36puk5yRsJvrV?#+%QD>(B
z&-f76;E;GDLsJto0}}&7Qv*FqBSQ;gGsDSh`3BksOl->fm?{l{%1w;)EP#ZWd2vZm
fW?p*8WdD54$*c0Md7+YKhQ<aK=9@p|^CbWP<m5Dq

delta 1264
zcmcK3L5NIo9KiAa|IO^|TC?x5HDXO`hIZS~?0awCV^-Q><UnlOn)ZO~#%@NmPqTBN
z#3V@$?0VXyXhM>cHIke*ZIZ(tkR%69lH@|0B+1+Qf92pv-~RRK*RS90U#^78mC#s=
zrWMBHxrkN}sg8q_LsvRa2qC0V6GqLr9Mm7wY&7dLL1%*s+Qk2@@86%F9G{k2V%UFc
zC&EHBwfj?c>m0%g(HfWnSHUr`6J)?5h557K8Mp(^fkR*`=l~Ig#&_TmsDR^OH&_Q2
zE6n=}UVyt`42*znU?pf!Xm}5%!8K3@d%$|oqEP=0yae~a1#lSjfYqQ;A@Tt{1~<S-
zFbKLqT%qnecm?i*i=YU4K?+0_!XLpCa1)#Yd%*_Ksu21CUV{f<0+c`>FoCY1eF9Ix
zEpQqPfgDIE$e-X1cnB^9SSF)>C7blmcPBL=d^3~upZ}(;pZht?cV$_Tp+Dv^StsJb
zi!E)-5093%AKkdG<Q1#4Sv{d25n)40<F+9U$LOyvT<}?Mv$V(xYe_7&Dc8GYAisG>
ze!#X|XN{T8SdN?OGF{7bGk&{g`e(f5tBe_8cm93bc2aB8U6z|3Efo)p?9cnxy<C$z
OlXh&&cB)@Ieef6Jra<`s

diff --git a/docs/_sources/standards.rst.txt b/docs/_sources/standards.rst.txt
index 2134fee..bc0a33d 100644
--- a/docs/_sources/standards.rst.txt
+++ b/docs/_sources/standards.rst.txt
@@ -9,10 +9,10 @@ As a main framework CraftBeerPi is based on `aiohttp`
 
 * aioHTTP https://aiohttp.readthedocs.io/en/stable/
 
-EventBus
+CBPiEventBus
 --------
 
-One core concept of CraftBeerPi 4.x is the EventBus.
+One core concept of CraftBeerPi 4.x is the CBPiEventBus.
 It should be avoided to call method on a controller directly. Events should be fired and listener methods should be used.
 This makes sure that all components are loosely coupled. New plugins can listen on events and extend or change the functionality easily.
 
diff --git a/docs/index.html b/docs/index.html
index e57386e..ba077fc 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -187,7 +187,7 @@
 </li>
 <li class="toctree-l1"><a class="reference internal" href="standards.html">Standard &amp; Guidelines</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="standards.html#python">Python</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="standards.html#eventbus">EventBus</a></li>
+<li class="toctree-l3"><a class="reference internal" href="standards.html#eventbus">CBPiEventBus</a></li>
 <li class="toctree-l3"><a class="reference internal" href="standards.html#http-endpoints">HTTP Endpoints</a></li>
 <li class="toctree-l3"><a class="reference internal" href="standards.html#websocket">WebSocket</a></li>
 </ul>
diff --git a/docs/standards.html b/docs/standards.html
index 12d93f3..f35fec9 100644
--- a/docs/standards.html
+++ b/docs/standards.html
@@ -87,7 +87,7 @@
 <li class="toctree-l1"><a class="reference internal" href="properties.html">Properties</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Standard &amp; Guidelines</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#python">Python</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#eventbus">EventBus</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#eventbus">CBPiEventBus</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#http-endpoints">HTTP Endpoints</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#websocket">WebSocket</a></li>
 </ul>
@@ -170,8 +170,8 @@ As a main framework CraftBeerPi is based on <cite>aiohttp</cite></p>
 <li>aioHTTP <a class="reference external" href="https://aiohttp.readthedocs.io/en/stable/">https://aiohttp.readthedocs.io/en/stable/</a></li>
 </ul>
 <div class="section" id="eventbus">
-<h3>EventBus<a class="headerlink" href="#eventbus" title="Permalink to this headline">¶</a></h3>
-<p>One core concept of CraftBeerPi 4.x is the EventBus.
+<h3>CBPiEventBus<a class="headerlink" href="#eventbus" title="Permalink to this headline">¶</a></h3>
+<p>One core concept of CraftBeerPi 4.x is the CBPiEventBus.
 It should be avoided to call method on a controller directly. Events should be fired and listener methods should be used.
 This makes sure that all components are loosely coupled. New plugins can listen on events and extend or change the functionality easily.</p>
 <p>Here an example how to fire an event</p>
diff --git a/docs_src/source/standards.rst b/docs_src/source/standards.rst
index 2d0b474..a23c932 100644
--- a/docs_src/source/standards.rst
+++ b/docs_src/source/standards.rst
@@ -9,10 +9,10 @@ As a main framework CraftBeerPi is based on `aiohttp`
 
 * aioHTTP https://aiohttp.readthedocs.io/en/stable/
 
-EventBus
+CBPiEventBus
 --------
 
-One core concept of CraftBeerPi 4.x is the EventBus.
+One core concept of CraftBeerPi 4.x is the CBPiEventBus.
 It should be avoided to call method on a controller directly. Events should be fired and listener methods should be used.
 This makes sure that all components are loosely coupled. New plugins can listen on events and extend or change the functionality easily.
 
diff --git a/main2.py b/main2.py
index d64f18f..2330f3f 100644
--- a/main2.py
+++ b/main2.py
@@ -1,90 +1,7 @@
-import asyncio
-import re
-
-from core.eventbus3 import EventBus
 
 
-async def waiter(event):
-    print('waiting for it ...')
-    await asyncio.sleep(4)
-    print('... got it!')
-    event.set()
+with open('./config/plugin_list.txt') as f:
+    required = f.read().splitlines()
 
-async def main(loop):
-    # Create an Event object.
-    event = asyncio.Event()
-
-    # Spawn a Task to wait until 'event' is set.
-    #waiter_task = asyncio.create_task(waiter(event))
-
-    waiter_task = loop.create_task(waiter(event))
-    print("WAIT FOR EVENT")
-    await event.wait()
-
-
-
-    # Wait until the waiter task is finished.
-    await waiter_task
-
-#loop = asyncio.get_event_loop()
-#loop.run_until_complete(main(loop))
-#loop.close()
-
-
-bus = EventBus(None)
-
-def test(**kwargs):
-    print("")
-    print("------------>  HALLO WILD CARD")
-    print("")
-    print(hex(id(test)))
-    print("BUS",bus)
-
-
-def test2(**kwargs):
-    print("------------> HALLO NAME")
-
-
-
-class Name():
-
-    def test(self, **kwargs):
-        print("---->OK")
-        bus.unregister(self.test)
-        print("####################  ID2", hex(id(n.test)))
-
-
-n = Name()
-print("the ID", hex(id(n.test)))
-id1 = bus.register("test/#", n.test)
-print("the ID2", hex(id(n.test)))
-
-if n.test == n.test:
-    print("SAME")
-id1 = bus.register("test/#", test)
-id2 = bus.register("test/name", test2)
-
-print(id1, id2)
-
-
-from gtts import gTTS
-
-
-
-print(hex(id(test2)))
-
-print(bus.get_callbacks("test/name"))
-
-bus.fire("test/name")
-
-bus.fire("test/name")
-
-bus.unregister(test2)
-
-bus.fire("test/name")
-
-
-m0 = re.match("kettle_logic_(\d+)", "kettle_1logic_22")
-print(m0)
-#print(m0.group(1))
+    print(required)
 
diff --git a/run.py b/run.py
index 4ea12ed..adb7e03 100644
--- a/run.py
+++ b/run.py
@@ -4,5 +4,4 @@ from core.craftbeerpi import CraftBeerPi
 
 
 cbpi = CraftBeerPi()
-cbpi.setup()
 cbpi.start()
\ No newline at end of file
diff --git a/sensor_None.log b/sensor_None.log
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/test_app.py b/tests/test_app.py
index 73a34c8..f346f93 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -1,3 +1,4 @@
+import aiohttp
 from aiohttp.test_utils import AioHTTPTestCase, unittest_run_loop
 
 from core.craftbeerpi import CraftBeerPi
@@ -11,14 +12,20 @@ class MyAppTestCase(AioHTTPTestCase):
     async def get_application(self):
         self.cbpi = CraftBeerPi()
         self.cbpi.setup()
+
+        await self.cbpi.init_serivces()
         return self.cbpi.app
 
 
     @unittest_run_loop
     async def test_example(self):
 
-        resp = await self.client.request("GET", "/actor/1/on")
+        resp = await self.client.post(path="/login", data={"username": "cbpi", "password": "123"})
+        print("resp.status",resp.status)
+        assert resp.status == 200
 
+        resp = await self.client.request("GET", "/actor/1/on")
+        print("resp.status", resp.status)
         assert resp.status == 204
         i = await self.cbpi.actor.get_one(1)
         assert i.instance.state is True