Increased threads to 50, added update timestamp for HTML pages.

utils/monitor.py

 #!/usr/bin/python
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may abtain a copy of the license at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 138 matching lines @@
         """
         Args:
             hostname: string, hostname of AutoTest host.
         """
         self.h = hostname
         self.client = paramiko.SSHClient()
         self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
 
     def run(self):
-        TB.hosts[self.h]['time'] = strftime(
-            '%d%b%Y %H:%M:%S', localtime())
         try:
             self.client.connect(self.h, username='root',
                                 key_filename=TB.privkey, timeout=TIMEOUT)
             TB.hosts[self.h]['status'] = True
         except Exception, e:
             TB.logger.error('Host %s: %s', self.h, e)
             TB.hosts[self.h]['status'] = False
         finally:
             if TB.hosts[self.h]['status']:
-                self.ReadRelease()
+                self.ReadRelease()  # Must be done before UpdateRelease().
                 self.ReadFirmware()
             self.UpdateRelease()  # Must be done before ReadResources().
             if TB.hosts[self.h]['status']:
                 self.ReadResources()
             TB.logger.debug('Closing client for %s', self.h)
             self.client.close()
+        TB.hosts[self.h]['time'] = strftime(
+            '%d%b%Y %H:%M:%S', localtime())
 
 
     def ReadRelease(self):
         """Get the Chrome OS Release version."""
         # The PTR key will mark the current version.
 
         cmd = 'cat /etc/lsb-release'
         try:
             stdin, stdout, stderr = self.client.exec_command(cmd)
             for line in stdout:
@@ skipping 72 matching lines @@
                         # This means the release file has the wrong format, so
                         # we'll just write a new one with current values.
                         update_file = True
                         lines.pop(lines.index(line))
                     else:
                         # If we get here than it's probably a blank line.
                         update_file = True
                         lines.pop(lines.index(line))
 
                 if update_file:
-                    TB.logger.info('Updating %s', relfile)
+                    TB.logger.debug('Updating %s', relfile)
                     shutil.move(relfile, tmpfile)
                     # Put the most recent update in the new file, and make the
                     # PTR key to point to it.
                     lines.append('%s=%s\n' % (TB.time,
                                  TB.hosts[self.h][item]['PTR']))
                     lines.append('PTR=%s' % TB.hosts[self.h][item]['PTR'])
                     try:
                         rf = open(relfile, 'w')
                         for line in lines:
                             rf.write(line)
@@ skipping 133 matching lines @@
             t.start()
 
         # Fill the requests queue with AutoTest host objects.
         for host in self.afe_hosts:
             TB.logger.debug('Placing %s in host queue.', host.hostname)
             TB.q.put(host)
 
 
         if TB.graph:
             # Graphing takes much longer, so increase the max runtime.
-            maxtime = RUNTIME * 5
+            maxtime = RUNTIME * 6
         else:
             maxtime = RUNTIME
         # Queue.join() will wait for all jobs in the queue to finish, or
         # until the timeout value is reached.  Timeout is needed because
         # sometimes the paramiko client will hang.
         TB.logger.debug('Joining run queue.')
         TB.q.join(timeout=maxtime)
         TB.logger.info('%s hosts left in host queue', TB.q.qsize())
 
         LogLevel = TB.logger.getEffectiveLevel()
@@ skipping 310 matching lines @@
                 f.write('<td>%s<br><a href=%s.html>' % (r, r))
                 f.write('<img src=%s%s.png width=475 height=250></a></td>' % (
                     r,k))
                 if newrow:
                     newrow = False
                 else:
                     f.write('</tr>\n')
                     newrow = True
             f.write('</table><p>\n')
             f.write('</center>\n')
+            f.write('<H5>Last Update: %s</H5>' % TB.hosts[hostname]['time'])
             f.write('</BODY></HTML>')
             f.close()
             os.chmod(pathname[k], 0644)
         if not os.path.isfile(index_file):
             os.symlink(pathname[TB.rrdtimes[0]], index_file)
 
         # Create HTML files for each resource for all time periods.
         for r in resource_list:
             rrdfile = os.path.join(rrd_dir, r + '.html')
             f = open(rrdfile, 'w')
             f.write('<HTML><HEAD>')
             f.write('<center><TITLE>%s %s Resources</TITLE></HEAD>' % (
                      hostname, r))
             f.write('<BODY><H1>%s %s Resources</H1>' % (hostname, r))
             for i in TB.releases:
                 f.write('<H4>%s: %s</H4>' % (i, TB.hosts[hostname][i]['PTR']))
             f.write('<table border=5 bgcolor=#B5B5B5>')
             f.write('<tr>')
             for h in TB.rrdtimes:
                 f.write('<td><a href="#%s"><b>%s</b></a>' % (h, h))
             f.write('</table>')
             f.write('<HR>')
             f.write('<table border=1 bgcolor=#EEEEEE>')
             for h in TB.rrdtimes:
                 f.write('<tr><td><a name="%s"><img src=%s%s.png>' % (h, r, h))
                 f.write('</a></td></tr>\n')
             f.write('</table><p>\n')
             f.write('</center>\n')
+            f.write('<H5>Last Update: %s</H5>' % TB.hosts[hostname]['time'])
             f.write('</BODY></HTML>')
             f.close()
             os.chmod(rrdfile, 0644)
 
 
     def ParseBattery(self, h, k):
         """Convert /proc/acpi/battery/BAT0/state to a list of strings.
 
         Args:
             h: string, hostname of host in AutoTest.
@@ skipping 926 matching lines @@
     parser.add_option('--logfile',
                       help='name of logfile [default: %default]',
                       default='monitor.log',
                       dest='logfile')
     parser.add_option('--log_to_stdout',
                       help='Send output to StdOut [default: %default]',
                       default=False,
                       dest='log_to_stdout')
     parser.add_option('--threads',
                       help='Number of threads to create [default: %default]',
-                      default=25,
+                      default=50,
                       dest='threads')
     parser.add_option('--update',
                       help='Collect data from hosts [default: %default]',
                       default=True,
                       dest='update')
     parser.add_option('--url',
                       help='URL for landing page [default: %default]',
                       default='http://www/~chromeos-test/systemhealth/',
                       dest='url')
 
@@ skipping 12 matching lines @@
     sysmon.BuildLandingPage()
     runtime = time() - start
     endtime = strftime('%H:%M:%S', localtime())
     TB.logger.info('End Time: %s', endtime)
     TB.logger.info('Time of run: %s seconds', runtime)
     TB.logger.info('Ran with %d threads', TB.thread_num)
 
 
 if __name__ == '__main__':
     main(sys.argv)