Assembla home | Assembla project page
 

Changeset 1959

Show
Ignore:
Timestamp:
01/03/09 10:32:07 (1 year ago)
Author:
shypike
Message:

Show server load in statistics block.
(not in Prototype)
Closes #159.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/main/interfaces/Default/templates/inc_bottom.tmpl

    r1647 r1959  
    11<div class="footer"> 
    22<b>Download Dir:</b> $diskspace1 GB - <b>Complete Dir:</b> $diskspace2 GB - <b>Download speed:</b> $kbpersec KB/s - <b>Queued:</b> $mbleft/$mb MB 
     3<!--#if $loadavg#--> 
     4    - <b>Sysload</b> $loadavg 
     5<!--#end if#--> 
    36<!--#if $paused#--> 
    47    - <b>PAUSED</b> 

  • trunk/main/interfaces/Plush/templates/queue.tmpl

    r1911 r1959  
    100100        <strong class="<!--#if float($diskspace2) < float($mb)/1024 #-->stats_complete_freespace_needspace" title="Not enough disk space to complete downloads!<!--#else#-->stats_complete_freespace<!--#end if#-->">$diskspace2&nbsp;GB</strong>&nbsp;Free&nbsp;Space 
    101101        <!--#end if#--> 
     102        <!--#if $loadavg#--> 
     103            <strong>SysLoad&nbsp;$loadavg</strong> 
     104        <!--#end if#--> 
    102105    </div> 
    103106     

  • trunk/main/interfaces/smpl/templates/main.tmpl

    r1905 r1959  
    847847                                Complete<br /> 
    848848                                <span class="small"><span id="ds2">${diskspace2}</span>GB / ${diskspacetotal2}GB</span> 
     849                <!--#if $loadavg#--> 
     850                    SysLoad<br /> 
     851                    <span class="small"><span id="ds3">${loadavg}</span></span> 
     852                <!--#end if#--> 
    849853                                </center> 
    850854                                 

  • trunk/main/sabnzbd/interface.py

    r1950 r1959  
    4242from Cheetah.Template import Template 
    4343import sabnzbd.email as email 
    44 from sabnzbd.misc import real_path, create_real_path, \ 
     44from sabnzbd.misc import real_path, create_real_path, loadavg, \ 
    4545     to_units, from_units, SameFile, diskfree, disktotal 
    4646from sabnzbd.nzbstuff import SplitFileName 
    …… 
    21162116    header['diskspacetotal1'] = "%.2f" % disktotal(cfg.DOWNLOAD_DIR.get_path()) 
    21172117    header['diskspacetotal2'] = "%.2f" % disktotal(cfg.COMPLETE_DIR.get_path()) 
     2118    header['loadavg'] = loadavg() 
    21182119    header['speedlimit'] = "%s" % speed_limit 
    21192120    header['restart_req'] = sabnzbd.RESTART_REQ 

  • trunk/main/sabnzbd/misc.py

    r1948 r1959  
    791791 
    792792def loadavg(): 
    793     """ Return 1-minute load average of host or None if not supported 
     793    """ Return 1, 5 and 15 minute load average of host or "" if not supported 
    794794    """ 
    795795    if os.name == 'nt' or sabnzbd.DARWIN: 
    796         return None 
    797  
     796        return "" 
    798797    try: 
    799798        loadavgstr = open('/proc/loadavg', 'r').readline().strip() 
    800799    except: 
    801         return None 
     800        return "" 
    802801 
    803802    data = loadavgstr.split() 
    804     avg1, avg5, avg15 = map(float, data[:3]) 
    805  
    806     return avg1 
     803    try: 
     804        a1, a5, a15 = map(float, data[:3]) 
     805        return "%2d, %2d, %2d" % (a1*100, a5*100, a15*100) 
     806    except: 
     807        return "" 
    807808 
    808809