Skip to content

Commit

Permalink
Minor tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
sabbas committed Apr 15, 2017
1 parent f502350 commit 2e724e6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 114 deletions.
111 changes: 0 additions & 111 deletions nginx.conf
Original file line number Diff line number Diff line change
@@ -1,51 +1,16 @@

#user nobody;
worker_processes 1;

#error_log logs/error.log;
#error_log logs/error.log notice;
#error_log logs/error.log info;

#pid logs/nginx.pid;


events {
worker_connections 1024;
}


http {
include mime.types;
default_type application/octet-stream;

#log_format main '$remote_addr - $remote_user [$time_local] "$request" '
# '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"';

#access_log logs/access.log main;

sendfile on;
#tcp_nopush on;

#keepalive_timeout 0;
keepalive_timeout 65;


#gzip on;

server {
listen 8080;
server_name localhost;

#charset koi8-r;

#access_log logs/host.access.log main;

location / {
root html;
index index.html index.htm;
}

location = /sub {

nchan_subscriber;
Expand All @@ -57,82 +22,6 @@ http {

nchan_publisher;
nchan_channel_id $arg_id;
nchan_store_messages off;
}

location ~\.(html) {

root /home/sabbas/Documents/pythondev/python-nchan/www/;

}

#error_page 404 /404.html;

# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}

# proxy the PHP scripts to Apache listening on 127.0.0.1:80
#
#location ~ \.php$ {
# proxy_pass http://127.0.0.1;
#}

# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
#
#location ~ \.php$ {
# root html;
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
# include fastcgi_params;
#}

# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
#location ~ /\.ht {
# deny all;
#}
}


# another virtual host using mix of IP-, name-, and port-based configuration
#
#server {
# listen 8000;
# listen somename:8080;
# server_name somename alias another.alias;

# location / {
# root html;
# index index.html index.htm;
# }
#}


# HTTPS server
#
#server {
# listen 443 ssl;
# server_name localhost;

# ssl_certificate cert.pem;
# ssl_certificate_key cert.key;

# ssl_session_cache shared:SSL:1m;
# ssl_session_timeout 5m;

# ssl_ciphers HIGH:!aNULL:!MD5;
# ssl_prefer_server_ciphers on;

# location / {
# root html;
# index index.html index.htm;
# }
#}

}
6 changes: 3 additions & 3 deletions pytop.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
CPU_COUNT = psutil.cpu_count()


def top(sort_by='cpu_percent', top_n_procs=15):
def top(sort_by='cpu_percent', top_n_procs=20):
"""
A function that simulates the unix top command
:return:
Expand All @@ -33,8 +33,8 @@ def top(sort_by='cpu_percent', top_n_procs=15):
username=pinfo['username'],
name=pinfo['name'],
pid=pinfo['pid'],
resident_memory=round(pinfo['memory_info'].rss / 1e9, 2),
virtual_memory=round(pinfo['memory_info'].vms / 1e9, 2),
resident_memory=round(pinfo['memory_info'].rss / 1e9, 2), # Size in GB
virtual_memory=round(pinfo['memory_info'].vms / 1e9, 2), # Size in GB
memory_percent=round(pinfo['memory_percent'], 2),
cpu_percent=round(pinfo['cpu_percent'], 2),
id=pinfo['pid'],
Expand Down

0 comments on commit 2e724e6

Please sign in to comment.