grid-x / ocpp-go

89%

gridx_extensions: 89%

LAST BUILD ON BRANCH fix/client-dispatcher-send-on-closed-channel

branch: SELECT

CHANGE BRANCH

x

Sync Branches

• No branch selected
• dependabot/go_modules/github.com/sirupsen/logrus-1.8.3
• feat/add_bdl_extension
• feat/add_logging_of_raw_json_msg
• feat/create_ocpp_go_server_2.0.1_int-255
• feat/fix_several_race_conditions
• feat/rebase_master
• feat/sync_with_master
• feature/sync_upstream
• fix/add_new_bdl_subprotocol_name-inte-547
• fix/allow-empty-idTag-INTE-1856
• fix/allow_change_configuration_with_empty_value
• fix/charging_station_waiting_forever_in_SendRequest_after_stopped
• fix/client-dispatcher-send-on-closed-channel
• fix/close_chargingstation_channels_on_stop_ocpp2.0.1_upstream
• fix/fix_close_nil_channel_panic_on_stop
• fix/improve_clients_stop_function
• fix/ocpp_onreconnect_GBX-2485
• fix/onreconnected_dispatch
• fix/remove_docker_publish_workflow
• fix/remove_duplicate_reconnect
• fix/security_issue_yaml_pkg
• fix/stop_transaction_meter_stop
• fix/websocket_close_race
• gridx_extensions
• gridx_master_ng
• master
• sync-fork
• sync-gridx_extensions
• tls

Build # 23795973618

Build Type

push

github

Committed by mkrafeld

Commit Message

fix(ocppj): guard DefaultClientDispatcher.SendRequest against send-on-closed-channel panic

Stop() previously closed requestChannel, so a concurrent SendRequest call
racing the close would panic at 'd.requestChannel <- true'. This mirrors
the same bug the ServerDispatcher already had fixed via stoppedC.

Changes:
- Add stoppedC chan struct{} to DefaultClientDispatcher
- Start(): initialise stoppedC alongside requestChannel (under mutex)
- Stop(): close stoppedC instead of requestChannel; set requestChannel=nil
  so IsRunning() returns false immediately
- SendRequest(): capture rc/sc under RLock, return error if rc==nil, then
  use select{case rc<-true / case <-sc} so a concurrent Stop() returns
  "client stopped" instead of panicking
- messagePump(): add case <-d.stoppedC as primary exit path

Coverage Stats

22 of 29 new or added lines in 1 file covered. (75.86%)

4 existing lines in 1 file now uncovered.

6542 of 7360 relevant lines covered (88.89%)

13.5 hits per line