File tree 4 files changed +20
-3
lines changed
4 files changed +20
-3
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,11 @@ name: feature_branch
2
2
on :
3
3
pull_request :
4
4
types : [opened, synchronize, reopened]
5
+ # make GHA actions use node16 which still works with bionic
6
+ # See https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
7
+ # Unclear how long this will work though. Remove after rebase carma-streets to newer Ubuntu release
8
+ env :
9
+ ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION : true
5
10
jobs :
6
11
build :
7
12
defaults :
Original file line number Diff line number Diff line change @@ -2,6 +2,11 @@ name: master
2
2
on :
3
3
push :
4
4
branches : [master]
5
+ # make GHA actions use node16 which still works with bionic
6
+ # See https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
7
+ # Unclear how long this will work though. Remove after rebase carma-streets to newer Ubuntu release
8
+ env :
9
+ ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION : true
5
10
jobs :
6
11
docker-build :
7
12
strategy :
Original file line number Diff line number Diff line change 3
3
push :
4
4
tags :
5
5
- " carma-system-*"
6
+ # make GHA actions use node16 which still works with bionic
7
+ # See https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
8
+ # Unclear how long this will work though. Remove after rebase carma-streets to newer Ubuntu release
9
+ env :
10
+ ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION : true
6
11
jobs :
7
12
docker-build :
8
13
strategy :
Original file line number Diff line number Diff line change @@ -389,7 +389,7 @@ namespace traffic_signal_controller_service {
389
389
// Log command info sent
390
390
SPDLOG_INFO (command_to_execute.get_cmd_info ());
391
391
if ( enable_snmp_cmd_logging_ ){
392
- if (auto logger = spdlog::get (" snmp_cmd_logger " ); logger != nullptr ){
392
+ if (auto logger = spdlog::get (SNMP_COMMAND_LOGGER_NAME ); logger != nullptr ){
393
393
logger->info ( command_to_execute.get_cmd_info ());
394
394
}
395
395
}
@@ -453,11 +453,13 @@ namespace traffic_signal_controller_service {
453
453
std::thread spat_t (&tsc_service::produce_spat_json, this );
454
454
455
455
if ( spat_proj_mode == SPAT_PROJECTION_MODE::DPP_PROJECTION ) {
456
+ // Run thread to consume dpp
456
457
std::thread desired_phase_plan_t (&tsc_service::consume_desired_phase_plan, this );
457
- SPDLOG_DEBUG (" Thread joined to consume desired phase plan generated by carma-streets SO service." );
458
- desired_phase_plan_t .join ();
458
+ SPDLOG_DEBUG (" Thread joined to consume desired phase plan generated by carma-streets SO service and send SNMP commands" );
459
459
// Run tsc control phases
460
460
std::thread control_phases_t (&tsc_service::control_tsc_phases, this );
461
+
462
+ desired_phase_plan_t .join ();
461
463
control_phases_t .join ();
462
464
}
463
465
// TODO: Remove if no longer necessary for TM/TSP MMITSS Integration
You can’t perform that action at this time.
0 commit comments