@@ -76,11 +76,7 @@ def ring_bell(self, bell: Bell, expected_stroke: Stroke) -> bool:
7676
7777 bell_num : int = bell .number
7878 is_handstroke : bool = stroke .is_hand ()
79- self ._emit (
80- "c_bell_rung" ,
81- {"bell" : bell_num , "stroke" : is_handstroke , "tower_id" : self .tower_id },
82- ""
83- )
79+ self ._emit ("c_bell_rung" , {"bell" : bell_num , "stroke" : is_handstroke , "tower_id" : self .tower_id })
8480
8581 return True
8682 except Exception as e :
@@ -113,27 +109,23 @@ def get_stroke(self, bell: Bell) -> Optional[Stroke]:
113109
114110 def make_call (self , call : str ) -> None :
115111 """ Broadcasts a given call to the other users of the tower. """
116- self ._emit ("c_call" , {"call" : call , "tower_id" : self .tower_id }, f"Call '{ call } )
112+ self .logger .info (f"(EMIT): Calling '{ call } )
113+ self ._emit ("c_call" , {"call" : call , "tower_id" : self .tower_id })
117114
118115 def set_at_hand (self ) -> None :
119116 """ Sets all the bells at hand. """
120- self ._emit ("c_set_bells" , {"tower_id" : self .tower_id }, "Set at hand" )
117+ self .logger .info ("(EMIT): Setting bells at handstroke" )
118+ self ._emit ("c_set_bells" , {"tower_id" : self .tower_id })
121119
122120 def set_number_of_bells (self , number : int ) -> None :
123121 """ Set the number of bells in the tower. """
124- self ._emit (
125- "c_size_change" ,
126- {"new_size" : number , "tower_id" : self .tower_id },
127- f"Set number of bells '{ number }
128- )
122+ self .logger .info (f"(EMIT): Setting size to { number } )
123+ self ._emit ("c_size_change" , {"new_size" : number , "tower_id" : self .tower_id })
129124
130125 def set_is_ringing (self , value : bool ) -> None :
131126 """ Broadcast to all the users that Wheatley has started or stopped ringing. """
132- self ._emit (
133- "c_wheatley_is_ringing" ,
134- {"is_ringing" : value , "tower_id" : self .tower_id },
135- f"Setting is ringing to { value }
136- )
127+ self .logger .info (f"(EMIT): Telling RR clients to set is_ringing to { value } )
128+ self ._emit ("c_wheatley_is_ringing" , {"is_ringing" : value , "tower_id" : self .tower_id })
137129
138130 def wait_loaded (self ) -> None :
139131 """ Pause the thread until the socket-io connection is open and stable. """
@@ -155,7 +147,7 @@ def _create_client(self) -> None:
155147 """ Generates the socket-io client and attaches callbacks. """
156148 self ._socket_io_client = socketio .Client ()
157149 self ._socket_io_client .connect (self ._url )
158- self .logger .info (f"Connected to { self ._url } )
150+ self .logger .debug (f"Connected to { self ._url } )
159151
160152 self ._socket_io_client .on ("s_bell_rung" , self ._on_bell_rung )
161153 self ._socket_io_client .on ("s_global_state" , self ._on_global_bell_state )
@@ -241,15 +233,16 @@ def _on_user_list(self, user_list: JSON) -> None:
241233
242234 def _join_tower (self ) -> None :
243235 """ Joins the tower as an anonymous user. """
236+ self .logger .info (f"(EMIT): Joining tower { self .tower_id } )
244237 self ._emit (
245238 "c_join" ,
246239 {"anonymous_user" : True , "tower_id" : self .tower_id },
247- f"Joining tower { self .tower_id }
248240 )
249241
250242 def _request_global_state (self ) -> None :
251243 """ Send a request to the server to get the current state of the tower. """
252- self ._emit ('c_request_global_state' , {"tower_id" : self .tower_id }, "Request state" )
244+ self .logger .debug ("(EMIT): Requesting global state." )
245+ self ._emit ('c_request_global_state' , {"tower_id" : self .tower_id })
253246
254247 def _on_bell_rung (self , data : JSON ) -> None :
255248 """ Callback called when the client receives a signal that a bell has been rung. """
@@ -328,16 +321,13 @@ def _on_call(self, data: Dict[str, str]) -> None:
328321 if not found_callback :
329322 self .logger .warning (f"No callback found for '{ call } )
330323
331- def _emit (self , event : str , data : Any , message : str ) -> None :
324+ def _emit (self , event : str , data : Any ) -> None :
332325 """ Emit a socket-io signal. """
333326 if self ._socket_io_client is None or not self ._socket_io_client .connected :
334327 raise SocketIOClientError ("Not Connected" )
335328
336329 self ._socket_io_client .emit (event , data )
337330
338- if message :
339- self .logger .info (f"EMIT: { message } )
340-
341331 @staticmethod
342332 def _bells_set_at_hand (number : int ) -> List [Stroke ]:
343333 """ Returns the representation of `number` bells, all set at handstroke. """
@@ -346,4 +336,3 @@ def _bells_set_at_hand(number: int) -> List[Stroke]:
346336
347337class SocketIOClientError (Exception ):
348338 """Errors related to SocketIO Client"""
349- pass
0 commit comments