Reworked devserver so that update images generated are cached in directories named after

devserver.py

 #!/usr/bin/python
 
 # Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A CherryPy-based webserver to host images and build packages."""
 
 import cherrypy
 import optparse
@@ skipping 115 matching lines @@
                     default=False, help='Pre-generate update payload.')
   parser.add_option('--port', default=8080,
                     help='Port for the dev server to use.')
   parser.add_option('--src_image', default='',
                     help='Image on remote machine for generating delta update.')
   parser.add_option('-t', action='store_true', dest='test_image')
   parser.add_option('-u', '--urlbase', dest='urlbase',
                     help='base URL, other than devserver, for update images.')
   parser.add_option('--use_cached', action="store_true", default=False,
                     help='Prefer cached image regardless of timestamps.')
+  parser.add_option('--clear_cache', action="store_true", default=False,
+                    help='Clear out all cached deltas and exit')

[sosa, 2010/11/15 21:59:17]

Just deltas?

   parser.add_option('--validate_factory_config', action="store_true",
                     dest='validate_factory_config',
                     help='Validate factory config file, then exit.')
   parser.set_usage(parser.format_help())
   (options, _) = parser.parse_args()
 
   devserver_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
   root_dir = os.path.realpath('%s/../..' % devserver_dir)
   serve_only = False
 
   if options.archive_dir:
     static_dir = os.path.realpath(options.archive_dir)
     _PrepareToServeUpdatesOnly(static_dir)
     serve_only = True
   else:
     static_dir = os.path.realpath('%s/static' % devserver_dir)
     os.system('mkdir -p %s' % static_dir)
 
+  cache_dir = os.path.join(static_dir, 'cache')
+  cherrypy.log('Using cache directory %s' % cache_dir, 'DEVSERVER')
+  if options.clear_cache:
+    # Clear the cache and exit
+    sys.exit(os.system('sudo rm -rf %s' % cache_dir))

[sosa, 2010/11/15 21:59:17]

Why not just clean and then startup?

[dgarrett, 2010/11/15 23:32:39]

I wanted a way to clean and exit as well as clean and start. However, I didn't
want two different command line options. Since devserver will start with no
options, clean and no other option would mean there was no way to clear and
exit.

+  else:
+    if os.path.exists(cache_dir):
+      # Clear all but the last 12 cached deltas

[sosa, 2010/11/15 21:59:17]

Set as a module constant i.e. CACHED_ENTRIES=12

+      cmd = 'cd %s; ls -1tr | head --lines=-12 | xargs rm -rf' % cache_dir
+      if os.system(cmd) != 0:

[sosa, 2010/11/15 21:59:17]

Return return code?

[dgarrett, 2010/11/15 23:32:39]

You can't since you aren't in a function. I wrote it that way the first time
though.

On 2010/11/15 21:59:17, sosa wrote:

+        cherrypy.log('Failed to clean up old delta cache files with %s' % cmd,
+                     'DEVSERVER')
+        sys.exit(1)
+
   cherrypy.log('Source root is %s' % root_dir, 'DEVSERVER')
   cherrypy.log('Serving from %s' % static_dir, 'DEVSERVER')
 
   updater = autoupdate.Autoupdate(
       root_dir=root_dir,
       static_dir=static_dir,
       serve_only=serve_only,
       urlbase=options.urlbase,
       test_image=options.test_image,
       factory_config_path=options.factory_config,
@@ skipping 13 matching lines @@
     updater.ImportFactoryConfigFile(options.factory_config,
                                      options.validate_factory_config)
     # We don't run the dev server with this option.
     if options.validate_factory_config:
       sys.exit(0)
   elif options.pregenerate_update:
     if not updater.PreGenerateUpdate():
       sys.exit(1)
 
   cherrypy.quickstart(DevServerRoot(), config=_GetConfig(options))