File tree 3 files changed +10
-14
lines changed
3 files changed +10
-14
lines changed Original file line number Diff line number Diff line change @@ -53,13 +53,14 @@ from inverter import Inverter
53
53
from logger import LoggerMixin
54
54
from tibber_api_handler import TibberAPIHandler
55
55
56
- logger = LoggerMixin ()
56
+ logger = LoggerMixin ("Bashscript" )
57
57
logger .write_newlines_to_log_file ()
58
58
logger .log .info (f"Inverter is manually controlled by the user { getpass .getuser ()} : { sys .argv } " )
59
59
60
60
if sys .argv [1 ] == "--status" :
61
61
try :
62
- inverter = Inverter (True )
62
+ inverter = Inverter ()
63
+ inverter .log .name += " User"
63
64
soc = inverter .get_state_of_charge (True )
64
65
mode = inverter .get_operation_mode (True ).name
65
66
print (f"SoC: { soc } \n mode: { mode } " )
@@ -70,7 +71,8 @@ if sys.argv[1] == "--status":
70
71
if sys .argv [1 ] == "--mode" :
71
72
try :
72
73
new_mode = OperationMode [sys .argv [2 ]]
73
- inverter = Inverter (True )
74
+ inverter = Inverter ()
75
+ inverter .log .name += " User"
74
76
last_mode = inverter .get_operation_mode (True ).name
75
77
inverter .set_operation_mode (new_mode )
76
78
print (f"last mode: { last_mode } \n new mode: { new_mode .name } " )
Original file line number Diff line number Diff line change 6
6
from goodwe import inverter as GoodweInverter
7
7
from goodwe .et import OperationMode
8
8
from logger import LoggerMixin
9
- from sems_portal_api_handler import SemsPortalApiHandler
10
9
11
10
12
11
class Inverter (LoggerMixin ):
13
- def __init__ (self , controlled_by_bash_script : bool = False ):
12
+ def __init__ (self ):
14
13
super ().__init__ ()
15
14
16
15
self ._device = None
17
16
self .hostname = EnvironmentVariableGetter .get ("INVERTER_HOSTNAME" )
18
17
self .battery_capacity = EnergyAmount (int (EnvironmentVariableGetter .get ("INVERTER_BATTERY_CAPACITY" )))
19
18
20
- self .sems_portal_api_handler = SemsPortalApiHandler ()
21
-
22
- # Add a notice to the loggers name to make to easier to identify actions taken by a user manually
23
- if controlled_by_bash_script :
24
- self .log .name += " USER"
25
- self .sems_portal_api_handler .log .name += " USER"
26
-
27
19
@property
28
20
def device (self ) -> GoodweInverter :
29
21
"""
Original file line number Diff line number Diff line change @@ -32,12 +32,14 @@ class LoggerMixin:
32
32
Notice that the loglevel trace with a weight of 5 was added.
33
33
"""
34
34
35
- def __init__ (self ):
35
+ def __init__ (self , logger_name : str = None ):
36
36
root_logger = logging .getLogger ()
37
37
if len (root_logger .handlers ) == 0 :
38
38
self ._set_logger (root_logger )
39
39
40
- self .log = logging .getLogger (self .__class__ .__name__ )
40
+ if not logger_name :
41
+ logger_name = self .__class__ .__name__
42
+ self .log = logging .getLogger (logger_name )
41
43
42
44
def _set_logger (self , root_logger : logging .Logger ) -> None :
43
45
"""
You can’t perform that action at this time.
0 commit comments