diff --git a/glances/__init__.py b/glances/__init__.py index 1eb6e55b..f28045f0 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/__main__.py b/glances/__main__.py index 1385f92f..926f5c5e 100644 --- a/glances/__main__.py +++ b/glances/__main__.py @@ -3,7 +3,7 @@ # # Glances - An eye on your system # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/actions.py b/glances/actions.py index 68f9ba7c..c8b60d26 100644 --- a/glances/actions.py +++ b/glances/actions.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/amps/glances_amp.py b/glances/amps/glances_amp.py index b814aaa2..fad142b5 100644 --- a/glances/amps/glances_amp.py +++ b/glances/amps/glances_amp.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/amps/glances_default.py b/glances/amps/glances_default.py index a7bb8ce6..ea3e9879 100644 --- a/glances/amps/glances_default.py +++ b/glances/amps/glances_default.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/amps/glances_nginx.py b/glances/amps/glances_nginx.py index fccd2cd6..b5b499d2 100644 --- a/glances/amps/glances_nginx.py +++ b/glances/amps/glances_nginx.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/amps/glances_systemd.py b/glances/amps/glances_systemd.py index 28af65f9..d8cc676b 100644 --- a/glances/amps/glances_systemd.py +++ b/glances/amps/glances_systemd.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/amps/glances_systemv.py b/glances/amps/glances_systemv.py index 8393e517..4edf428d 100644 --- a/glances/amps/glances_systemv.py +++ b/glances/amps/glances_systemv.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/amps_list.py b/glances/amps_list.py index 3e1152be..365d4c52 100644 --- a/glances/amps_list.py +++ b/glances/amps_list.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by @@ -113,7 +113,7 @@ class AmpsList(object): continue try: amps_list = [p for p in processlist for c in p['cmdline'] if re.search(v.regex(), c) is not None] - except TypeError: + except (TypeError, KeyError): continue if len(amps_list) > 0: # At least one process is matching the regex diff --git a/glances/attribute.py b/glances/attribute.py index 5f4472d2..cb129110 100644 --- a/glances/attribute.py +++ b/glances/attribute.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/autodiscover.py b/glances/autodiscover.py index 52f799e9..8742b4b0 100644 --- a/glances/autodiscover.py +++ b/glances/autodiscover.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/client.py b/glances/client.py index 29b54256..097b0aa4 100644 --- a/glances/client.py +++ b/glances/client.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/client_browser.py b/glances/client_browser.py index 3f08c8f3..38c91e44 100644 --- a/glances/client_browser.py +++ b/glances/client_browser.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/compat.py b/glances/compat.py index 4e50df22..3563810a 100644 --- a/glances/compat.py +++ b/glances/compat.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/config.py b/glances/config.py index 78975fcd..68f7755d 100644 --- a/glances/config.py +++ b/glances/config.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/cpu_percent.py b/glances/cpu_percent.py index 6939d2ff..a2a3fc7f 100644 --- a/glances/cpu_percent.py +++ b/glances/cpu_percent.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_cassandra.py b/glances/exports/glances_cassandra.py index f5a36fb6..4f25aaad 100644 --- a/glances/exports/glances_cassandra.py +++ b/glances/exports/glances_cassandra.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_couchdb.py b/glances/exports/glances_couchdb.py index a8a38914..87fe01f4 100644 --- a/glances/exports/glances_couchdb.py +++ b/glances/exports/glances_couchdb.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_csv.py b/glances/exports/glances_csv.py index 60a915d4..7df52977 100644 --- a/glances/exports/glances_csv.py +++ b/glances/exports/glances_csv.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_elasticsearch.py b/glances/exports/glances_elasticsearch.py index 11bc6ea1..c1282c11 100644 --- a/glances/exports/glances_elasticsearch.py +++ b/glances/exports/glances_elasticsearch.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_export.py b/glances/exports/glances_export.py index d05826f9..d871effc 100644 --- a/glances/exports/glances_export.py +++ b/glances/exports/glances_export.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_influxdb.py b/glances/exports/glances_influxdb.py index 7a204ce5..e14a24e2 100644 --- a/glances/exports/glances_influxdb.py +++ b/glances/exports/glances_influxdb.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_kafka.py b/glances/exports/glances_kafka.py index 9b56b3f5..86b96846 100644 --- a/glances/exports/glances_kafka.py +++ b/glances/exports/glances_kafka.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_opentsdb.py b/glances/exports/glances_opentsdb.py index 1e165709..71222b4a 100644 --- a/glances/exports/glances_opentsdb.py +++ b/glances/exports/glances_opentsdb.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_prometheus.py b/glances/exports/glances_prometheus.py index af3d557b..ab181e22 100644 --- a/glances/exports/glances_prometheus.py +++ b/glances/exports/glances_prometheus.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_rabbitmq.py b/glances/exports/glances_rabbitmq.py index e471209b..1aa35376 100644 --- a/glances/exports/glances_rabbitmq.py +++ b/glances/exports/glances_rabbitmq.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_restful.py b/glances/exports/glances_restful.py index 8b3567e6..cf1eab6e 100644 --- a/glances/exports/glances_restful.py +++ b/glances/exports/glances_restful.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_riemann.py b/glances/exports/glances_riemann.py index a5cc11bf..29296e0a 100644 --- a/glances/exports/glances_riemann.py +++ b/glances/exports/glances_riemann.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_statsd.py b/glances/exports/glances_statsd.py index 4ab88e9c..c5886d69 100644 --- a/glances/exports/glances_statsd.py +++ b/glances/exports/glances_statsd.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/exports/glances_zeromq.py b/glances/exports/glances_zeromq.py index 6262bcdc..c1448991 100644 --- a/glances/exports/glances_zeromq.py +++ b/glances/exports/glances_zeromq.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/filter.py b/glances/filter.py index f6099dcc..005eadb2 100644 --- a/glances/filter.py +++ b/glances/filter.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/folder_list.py b/glances/folder_list.py index c54eef54..cc7315d3 100644 --- a/glances/folder_list.py +++ b/glances/folder_list.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/globals.py b/glances/globals.py index 9d63290b..f330b13e 100644 --- a/glances/globals.py +++ b/glances/globals.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/history.py b/glances/history.py index 433f15df..b8ca1308 100644 --- a/glances/history.py +++ b/glances/history.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/logger.py b/glances/logger.py index 1c60eb6f..97903b10 100644 --- a/glances/logger.py +++ b/glances/logger.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/logs.py b/glances/logs.py index 9f3d7e54..1389ffae 100644 --- a/glances/logs.py +++ b/glances/logs.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/main.py b/glances/main.py index 2054dc9a..52c5c121 100644 --- a/glances/main.py +++ b/glances/main.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/outdated.py b/glances/outdated.py index 2b8fd630..adb5bbf8 100644 --- a/glances/outdated.py +++ b/glances/outdated.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/outputs/glances_bars.py b/glances/outputs/glances_bars.py index 77c91a85..691c2709 100644 --- a/glances/outputs/glances_bars.py +++ b/glances/outputs/glances_bars.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py index 4e757d96..f708a4ed 100644 --- a/glances/outputs/glances_bottle.py +++ b/glances/outputs/glances_bottle.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/outputs/glances_curses_browser.py b/glances/outputs/glances_curses_browser.py index efd330b0..a035b58e 100644 --- a/glances/outputs/glances_curses_browser.py +++ b/glances/outputs/glances_curses_browser.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/password.py b/glances/password.py index f0f9b6b1..3ac038ca 100644 --- a/glances/password.py +++ b/glances/password.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/password_list.py b/glances/password_list.py index 05f5eff6..509a890e 100644 --- a/glances/password_list.py +++ b/glances/password_list.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_alert.py b/glances/plugins/glances_alert.py index 159254c7..c46ecffe 100644 --- a/glances/plugins/glances_alert.py +++ b/glances/plugins/glances_alert.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_cloud.py b/glances/plugins/glances_cloud.py index 6f512e8c..f3c38c50 100644 --- a/glances/plugins/glances_cloud.py +++ b/glances/plugins/glances_cloud.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_cpu.py b/glances/plugins/glances_cpu.py index 32a913ef..d2472fc0 100644 --- a/glances/plugins/glances_cpu.py +++ b/glances/plugins/glances_cpu.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_diskio.py b/glances/plugins/glances_diskio.py index 535c8f5c..9d356e98 100644 --- a/glances/plugins/glances_diskio.py +++ b/glances/plugins/glances_diskio.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_docker.py b/glances/plugins/glances_docker.py index fc396a3f..cda525b4 100644 --- a/glances/plugins/glances_docker.py +++ b/glances/plugins/glances_docker.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_folders.py b/glances/plugins/glances_folders.py index f5275482..d9d602dc 100644 --- a/glances/plugins/glances_folders.py +++ b/glances/plugins/glances_folders.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_fs.py b/glances/plugins/glances_fs.py index 5e229b3d..773f9fb6 100644 --- a/glances/plugins/glances_fs.py +++ b/glances/plugins/glances_fs.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_hddtemp.py b/glances/plugins/glances_hddtemp.py index ba8a6f2a..6e24f0cb 100644 --- a/glances/plugins/glances_hddtemp.py +++ b/glances/plugins/glances_hddtemp.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_help.py b/glances/plugins/glances_help.py index aebf72df..503b1179 100644 --- a/glances/plugins/glances_help.py +++ b/glances/plugins/glances_help.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_ip.py b/glances/plugins/glances_ip.py index 1969f5db..850bb089 100644 --- a/glances/plugins/glances_ip.py +++ b/glances/plugins/glances_ip.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_irq.py b/glances/plugins/glances_irq.py index dec468a8..aa8cd576 100644 --- a/glances/plugins/glances_irq.py +++ b/glances/plugins/glances_irq.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Angelo Poerio +# Copyright (C) 2018 Angelo Poerio # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_load.py b/glances/plugins/glances_load.py index 86b1162f..7831de26 100644 --- a/glances/plugins/glances_load.py +++ b/glances/plugins/glances_load.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_mem.py b/glances/plugins/glances_mem.py index 40122ef5..378767a0 100644 --- a/glances/plugins/glances_mem.py +++ b/glances/plugins/glances_mem.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_memswap.py b/glances/plugins/glances_memswap.py index c801ecac..bfde8d2c 100644 --- a/glances/plugins/glances_memswap.py +++ b/glances/plugins/glances_memswap.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_network.py b/glances/plugins/glances_network.py index 0cef18c6..b51b4d26 100644 --- a/glances/plugins/glances_network.py +++ b/glances/plugins/glances_network.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_now.py b/glances/plugins/glances_now.py index 603b99f6..25e1df20 100644 --- a/glances/plugins/glances_now.py +++ b/glances/plugins/glances_now.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_percpu.py b/glances/plugins/glances_percpu.py index 88ab908d..5b69e02d 100644 --- a/glances/plugins/glances_percpu.py +++ b/glances/plugins/glances_percpu.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_plugin.py b/glances/plugins/glances_plugin.py index 501e5033..83458e1d 100644 --- a/glances/plugins/glances_plugin.py +++ b/glances/plugins/glances_plugin.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_ports.py b/glances/plugins/glances_ports.py index c68efebd..bec824a3 100644 --- a/glances/plugins/glances_ports.py +++ b/glances/plugins/glances_ports.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_processcount.py b/glances/plugins/glances_processcount.py index a8227135..177a3a36 100644 --- a/glances/plugins/glances_processcount.py +++ b/glances/plugins/glances_processcount.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_processlist.py b/glances/plugins/glances_processlist.py index 0ed7f4c8..5530f30e 100644 --- a/glances/plugins/glances_processlist.py +++ b/glances/plugins/glances_processlist.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by @@ -314,7 +314,10 @@ class Plugin(GlancesPlugin): # Command line # If no command line for the process is available, fallback to # the bare process name instead - cmdline = p['cmdline'] + if 'cmdline' in p: + cmdline = p['cmdline'] + else: + cmdline = '?' try: if cmdline: path, cmd, arguments = split_cmdline(cmdline) diff --git a/glances/plugins/glances_psutilversion.py b/glances/plugins/glances_psutilversion.py index 532d09cd..4c346964 100644 --- a/glances/plugins/glances_psutilversion.py +++ b/glances/plugins/glances_psutilversion.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_quicklook.py b/glances/plugins/glances_quicklook.py index f93d2cc7..53804617 100644 --- a/glances/plugins/glances_quicklook.py +++ b/glances/plugins/glances_quicklook.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_raid.py b/glances/plugins/glances_raid.py index 4fd50944..a7e813fd 100644 --- a/glances/plugins/glances_raid.py +++ b/glances/plugins/glances_raid.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_sensors.py b/glances/plugins/glances_sensors.py index 15405e39..20125a8f 100644 --- a/glances/plugins/glances_sensors.py +++ b/glances/plugins/glances_sensors.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_system.py b/glances/plugins/glances_system.py index 3416d393..63822d6e 100644 --- a/glances/plugins/glances_system.py +++ b/glances/plugins/glances_system.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_uptime.py b/glances/plugins/glances_uptime.py index e1ff00cd..ad3160cc 100644 --- a/glances/plugins/glances_uptime.py +++ b/glances/plugins/glances_uptime.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/plugins/glances_wifi.py b/glances/plugins/glances_wifi.py index 5557b24a..9963668c 100644 --- a/glances/plugins/glances_wifi.py +++ b/glances/plugins/glances_wifi.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/ports_list.py b/glances/ports_list.py index a97f8a30..5dcde324 100644 --- a/glances/ports_list.py +++ b/glances/ports_list.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/processes.py b/glances/processes.py index 892e11a0..d011ff32 100644 --- a/glances/processes.py +++ b/glances/processes.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by @@ -243,7 +243,8 @@ class GlancesProcesses(object): standard_attrs += ['gids'] # and build the processes stats list (psutil>=5.3.0) - self.processlist = [p.info for p in psutil.process_iter(attrs=standard_attrs, ad_value=None) + self.processlist = [p.info for p in psutil.process_iter(attrs=standard_attrs, + ad_value=None) # OS-related processes filter if not (BSD and p.info['name'] == 'idle') and not (WINDOWS and p.info['name'] == 'System Idle Process') and @@ -264,14 +265,13 @@ class GlancesProcesses(object): # Loop over processes and add metadata first = True for proc in self.processlist: + # Get extended stats, only for top processes (see issue #403). if first and not self.disable_extended_tag: - # Get extended stats, only for top processes (see issue #403). # - cpu_affinity (Linux, Windows, FreeBSD) # - ionice (Linux and Windows > Vista) # - num_ctx_switches (not available on Illumos/Solaris) # - num_fds (Unix-like) # - num_handles (Windows) - # - num_threads (not available on *BSD) # - memory_maps (only swap, Linux) # https://www.cyberciti.biz/faq/linux-which-process-is-using-swap/ # - connections (TCP and UDP) @@ -279,11 +279,14 @@ class GlancesProcesses(object): try: top_process = psutil.Process(proc['pid']) extended_stats = ['cpu_affinity', 'ionice', - 'num_ctx_switches', 'num_fds', - 'num_threads'] + 'num_ctx_switches', 'num_fds'] if WINDOWS: extended_stats += ['num_handles'] - extended = top_process.as_dict(attrs=extended_stats) + + # Get the extended stats + extended = top_process.as_dict(attrs=extended_stats, + ad_value=None) + if LINUX: try: extended['memory_swap'] = sum([v.swap for v in top_process.memory_maps()]) @@ -308,6 +311,7 @@ class GlancesProcesses(object): extended['extended_stats'] = True proc.update(extended) first = False + # /End of extended stats # Time since last update (for disk_io rate computation) proc['time_since_update'] = time_since_update @@ -340,6 +344,7 @@ class GlancesProcesses(object): proc['io_counters'] += [io_tag] # Compute the maximum value for keys in self._max_values_list: CPU, MEM + # Usefull to highlight the processes with maximum values for k in self._max_values_list: values_list = [i[k] for i in self.processlist if i[k] is not None] if values_list != []: diff --git a/glances/server.py b/glances/server.py index 83fa0aa7..79db271e 100644 --- a/glances/server.py +++ b/glances/server.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/snmp.py b/glances/snmp.py index 09b20f81..1b27925a 100644 --- a/glances/snmp.py +++ b/glances/snmp.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/standalone.py b/glances/standalone.py index d5ef4673..05cfe08c 100644 --- a/glances/standalone.py +++ b/glances/standalone.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/static_list.py b/glances/static_list.py index e93b4ec4..1d81ce12 100644 --- a/glances/static_list.py +++ b/glances/static_list.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/stats.py b/glances/stats.py index 65a2a26d..7ebecabe 100644 --- a/glances/stats.py +++ b/glances/stats.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/stats_client.py b/glances/stats_client.py index 1d6278cf..f2cef31e 100644 --- a/glances/stats_client.py +++ b/glances/stats_client.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/stats_client_snmp.py b/glances/stats_client_snmp.py index 7d7ac618..38f88f45 100644 --- a/glances/stats_client_snmp.py +++ b/glances/stats_client_snmp.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/stats_server.py b/glances/stats_server.py index 6427f09a..9b3ebaa3 100644 --- a/glances/stats_server.py +++ b/glances/stats_server.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/thresholds.py b/glances/thresholds.py index f56ce2ae..685e9e8c 100644 --- a/glances/thresholds.py +++ b/glances/thresholds.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/timer.py b/glances/timer.py index e2dadd36..8797f64b 100644 --- a/glances/timer.py +++ b/glances/timer.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/web_list.py b/glances/web_list.py index 23300a96..423594a2 100644 --- a/glances/web_list.py +++ b/glances/web_list.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/glances/webserver.py b/glances/webserver.py index de53a477..a4ac0aed 100644 --- a/glances/webserver.py +++ b/glances/webserver.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/unitest-restful.py b/unitest-restful.py index b178d7bc..de5f4dcf 100755 --- a/unitest-restful.py +++ b/unitest-restful.py @@ -3,7 +3,7 @@ # # Glances - An eye on your system # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/unitest-xmlrpc.py b/unitest-xmlrpc.py index 5fd52c5d..f64206bf 100755 --- a/unitest-xmlrpc.py +++ b/unitest-xmlrpc.py @@ -3,7 +3,7 @@ # # Glances - An eye on your system # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by diff --git a/unitest.py b/unitest.py index a36b3a2e..8918f6de 100755 --- a/unitest.py +++ b/unitest.py @@ -3,7 +3,7 @@ # # Glances - An eye on your system # -# Copyright (C) 2017 Nicolargo +# Copyright (C) 2018 Nicolargo # # Glances is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by