diff --git a/bridge_gps_data.py b/bridge_gps_data.py index d0129df..b705746 100644 --- a/bridge_gps_data.py +++ b/bridge_gps_data.py @@ -259,7 +259,7 @@ def process_sms(_rf_src, sms): try: send_email(to_email, email_subject, email_message) logger.info('Email sent.') - except: + except Exception as error_exception: logger.info('Failed to send email.') elif '@MH' in sms: grid_square = re.sub('@MH ', '', sms) @@ -315,8 +315,9 @@ def process_sms(_rf_src, sms): aprs_send(aprs_loc_packet) dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, strftime('%H:%M:%S - %m/%d/%y')) #logger.info('Sent manual position to APRS') - except: + except Exception as error_exception: logger.info('Exception. Not uploaded') + logger.info(error_exception) packet_assembly = '' @@ -336,15 +337,17 @@ def process_sms(_rf_src, sms): aprslib.parse(aprs_msg_pkt) aprs_send(aprs_msg_pkt) #logger.info('Packet sent.') - except: + except Exception as error_exception: logger.info('Error uploading MSG packet.') + logger.info(error_exception) try: if sms in cmd_list: logger.info('Executing command/script.') os.popen(cmd_list[sms]).read() packet_assembly = '' - except: + except Exception as error_exception: logger.info('Exception. Command possibly not in list, or other error.') + logger.info(error_exception) packet_assembly = '' else: pass @@ -1488,8 +1491,9 @@ class routerHBP(HBSYSTEM): aprs_send(aprs_loc_packet) dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, strftime('%H:%M:%S - %m/%d/%y')) #logger.info('Sent APRS packet') - except: + except Exception as error_exception: logger.info('Error. Failed to send packet. Packet may be malformed.') + logger.info(error_exception) udt_block = 1 hdr_type = '' else: @@ -1574,9 +1578,10 @@ class routerHBP(HBSYSTEM): logger.info('User comment: ' + comment) logger.info('User SSID: ' + ssid) logger.info('User icon: ' + icon_table + icon_icon) - except: + except Exception as error_exception: logger.info('Error or user settings file not found, proceeding with default settings.') aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(user_ssid) + '>APHBL3,TCPIP*:/' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + '/' + str(loc.lon[0:8]) + str(loc.lon_dir) + '[' + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) + logger.info(error_exception) try: # Try parse of APRS packet. If it fails, it will not upload to APRS-IS aprslib.parse(aprs_loc_packet) @@ -1585,8 +1590,9 @@ class routerHBP(HBSYSTEM): float(loc.lon) aprs_send(aprs_loc_packet) dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, str(loc.lat[0:7]) + str(loc.lat_dir), str(loc.lon[0:8]) + str(loc.lon_dir), strftime('%H:%M:%S - %m/%d/%y')) - except: + except Exception as error_exception: logger.info('Failed to parse packet. Packet may be deformed. Not uploaded.') + logger.info(error_exception) #final_packet = '' # Get callsign based on DMR ID # End APRS-IS upload