diff --git a/src/opnsense/scripts/netflow/flowd_aggregate.py b/src/opnsense/scripts/netflow/flowd_aggregate.py index d8f5ed085..ce2b6d37a 100755 --- a/src/opnsense/scripts/netflow/flowd_aggregate.py +++ b/src/opnsense/scripts/netflow/flowd_aggregate.py @@ -1,4 +1,4 @@ -#!/usr/local/bin/python2.7 +#!/usr/local/bin/python3 """ Copyright (c) 2016-2018 Ad Schellevis All rights reserved. @@ -160,7 +160,8 @@ class Main(object): syslog.syslog(syslog.LOG_NOTICE, 'vacuum done') except: syslog.syslog(syslog.LOG_ERR, 'flowd aggregate died with message %s' % (traceback.format_exc())) - return + raise + # rotate if needed check_rotate(self.config.flowd_source) @@ -213,7 +214,7 @@ if __name__ == '__main__': sortby = 'cumulative' ps = pstats.Stats(pr, stream=s).sort_stats(sortby) ps.print_stats() - print s.getvalue() + print (s.getvalue()) else: Main() elif cmd_args.repair: diff --git a/src/opnsense/scripts/netflow/lib/parse.py b/src/opnsense/scripts/netflow/lib/parse.py index c7f97d518..057a64005 100755 --- a/src/opnsense/scripts/netflow/lib/parse.py +++ b/src/opnsense/scripts/netflow/lib/parse.py @@ -44,7 +44,7 @@ class Interfaces(object): subprocess.call(['/sbin/ifconfig', '-l'], stdout=output_stream, stderr=open(os.devnull, 'wb')) output_stream.seek(0) if_index = 1 - for line in output_stream.read().split('\n')[0].split(): + for line in output_stream.readline().split(): self._if_index["%s" % if_index] = line if_index += 1