Skip to content

Commit

Permalink
closes #655 handle early inject_tlm
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanmelt committed Nov 16, 2017
1 parent 4bdb061 commit 6e9ea2b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
1 change: 1 addition & 0 deletions install/config/tools/cmd_tlm_server/cmd_tlm_server.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
TITLE 'COSMOS Command and Telemetry Server'
AUTO_INTERFACE_TARGETS # Use cmd_tlm_server.txt from all targets declared in system.txt
COLLECT_METADATA
20 changes: 12 additions & 8 deletions lib/cosmos/tools/cmd_tlm_server/api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -597,22 +597,26 @@ def inject_tlm(target_name, packet_name, item_hash = nil, value_type = :CONVERTE
# Write to routers
if send_routers
router = CmdTlmServer.instance.routers.all['PREIDENTIFIED_ROUTER']
begin
router.write(packet) if router.write_allowed? and router.connected?
rescue => err
Logger.error "Problem writing to router #{router.name} - #{err.class}:#{err.message}"
if router
begin
router.write(packet) if router.write_allowed? and router.connected?
rescue => err
Logger.error "Problem writing to router #{router.name} - #{err.class}:#{err.message}"
end
end
end

if create_new_logs or send_packet_log_writers
# Handle packet logging
packet_log_writer_pair = CmdTlmServer.instance.packet_logging.all['DEFAULT']

# Optionally create new logs
packet_log_writer_pair.tlm_log_writer.start if create_new_logs
if packet_log_writer_pair
# Optionally create new logs
packet_log_writer_pair.tlm_log_writer.start if create_new_logs

# Optionally write to packet logs - Write errors are handled by the log writer
packet_log_writer_pair.tlm_log_writer.write(packet) if send_packet_log_writers
# Optionally write to packet logs - Write errors are handled by the log writer
packet_log_writer_pair.tlm_log_writer.write(packet) if send_packet_log_writers
end
end
end

Expand Down

0 comments on commit 6e9ea2b

Please sign in to comment.