diff --git a/psdash/node.py b/psdash/node.py index 219042d..ed60556 100644 --- a/psdash/node.py +++ b/psdash/node.py @@ -325,7 +325,7 @@ def get_logs(self): try: stat = os.stat(log.filename) available_logs.append({ - 'path': log.filename, + 'path': log.filename.encode("utf-8"), 'size': stat.st_size, 'atime': stat.st_atime, 'mtime': stat.st_mtime diff --git a/psdash/templates/index.html b/psdash/templates/index.html index e6e15c3..96f41b3 100644 --- a/psdash/templates/index.html +++ b/psdash/templates/index.html @@ -39,7 +39,7 @@ {% for u in users %} - {{ u.name }} + {{ u.name.decode("utf-8") }} {{ u.started|fromtimestamp }} {{ u.host }} @@ -56,7 +56,7 @@ - + @@ -148,7 +148,7 @@ {% for ni in net_interfaces %} - + diff --git a/psdash/templates/logs.html b/psdash/templates/logs.html index a7f46e3..9cca012 100644 --- a/psdash/templates/logs.html +++ b/psdash/templates/logs.html @@ -17,7 +17,11 @@ {% for log in logs %} - + diff --git a/psdash/templates/network.html b/psdash/templates/network.html index 72c1f72..8dcad78 100644 --- a/psdash/templates/network.html +++ b/psdash/templates/network.html @@ -22,7 +22,7 @@ {% for io in network_interfaces %} - + diff --git a/psdash/templates/process/environment.html b/psdash/templates/process/environment.html index 4038779..60d2be7 100644 --- a/psdash/templates/process/environment.html +++ b/psdash/templates/process/environment.html @@ -10,8 +10,8 @@ {% for var, value in process_environ.iteritems() %} - - + + {% endfor %} diff --git a/psdash/templates/process/overview.html b/psdash/templates/process/overview.html index 75fece6..746ddf2 100644 --- a/psdash/templates/process/overview.html +++ b/psdash/templates/process/overview.html @@ -14,7 +14,7 @@ @@ -113,7 +113,7 @@ - + diff --git a/psdash/templates/processes.html b/psdash/templates/processes.html index ef235c9..bd747b2 100644 --- a/psdash/templates/processes.html +++ b/psdash/templates/processes.html @@ -53,7 +53,9 @@ {% for p in processes %} - +
Load average{{ load_avg[0] }} {{ load_avg[1] }} {{ load_avg[2] }}{{ load_avg[0]|round(2) }} {{ load_avg[1]|round(2) }} {{ load_avg[2]|round(2) }}
User
{{ ni.name }}{{ ni.name.decode("utf-8") }} {{ ni.ip }} {{ ni.send_rate|default(0)|filesizeformat }} {{ ni.recv_rate|default(0)|filesizeformat }}
{{ log.path }} + + {{ log.path.decode("utf-8") }} + + {{ log.size|filesizeformat }} {{ log.atime|fromtimestamp }} {{ log.mtime|fromtimestamp }}
{{ io.name }}{{ io.name.decode("utf-8") }} {{ io.ip }} {{ io.bytes_sent }} {{ io.bytes_recv }}
{{ var }}{{ value }}{{ var.decode("utf-8") }}{{ value.decode("utf-8") }}
Command - {{ process.cmdline }} + {{ process.cmdline.decode("utf-8") }}
CWD{{ process.cwd }}{{ process.cwd.decode("utf-8") }}
# File-descriptors
{{ p.pid }}{{ p.name }} + {{ p.name.decode("utf-8") }} + {{ p.user }} {{ p.status }} {{ p.created|fromtimestamp }}