Merge lp:~abentley/charms/precise/charmworld/charm-import-limit into lp:~juju-jitsu/charms/precise/charmworld/trunk

[Aaron Bentley]

Implement charm_import_limit config value.

Implement charm_import_limit config variable so that we can reconfigure staging to import all charms.

As a driveby, fix supervisor stop/start to change into the correct directory.

As a driveby, prevent install from deleting the project directory when run from upgrade.

[Richard Harding (rharding)]

would 0 make sense for no limit?

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-01-31 20:03:15 +0000
+++ config.yaml	2013-03-06 18:34:21 +0000
@@ -25,3 +25,9 @@
           juju-myservice-0
       If you're running multiple environments with the same services in them
       this allows you to differentiate between them.
+  charm_import_limit:
+      default: 110
+      type: int
+      description: |
+        The maximum number of charms to import from Launchpad during ingest.
+        -1 for no limit.
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2013-02-21 19:33:09 +0000
+++ hooks/config-changed	2013-03-06 18:34:21 +0000
@@ -60,8 +60,9 @@
 fi
 
 # Start the supervisor
-make stop_supervisor
-make start_supervisor
+make -C $project_dir stop_supervisor
+make -C $project_dir start_supervisor
+
 interval=`config-get execute-ingest-every`
 : ${interval:-0}
 
 
=== modified file 'hooks/install'
--- hooks/install	2013-02-14 19:25:32 +0000
+++ hooks/install	2013-03-06 18:34:21 +0000
@@ -34,4 +34,6 @@
 install -o charmworld -g charmworld -m 0755 -d $charmworld_home/var/charms
 $INSTALL scripts/run-write-errors $webops_home
 python scripts/gen_deploymgr.py
-maybe_rmtree $project_dir
+if [ "$UPGRADING" != "1" ]; then
+    maybe_rmtree $project_dir
+fi
 
=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2013-02-14 19:25:32 +0000
+++ hooks/upgrade-charm	2013-03-06 18:34:21 +0000
@@ -4,7 +4,7 @@
 set -x
 
 hooks/stop || true
-hooks/install
+UPGRADING=1 hooks/install
 maybe_rmtree ~ubuntu/charmworld
 maybe_rmtree ~ubuntu/var
 hooks/config-changed
 
=== modified file 'revision'
--- revision	2013-03-04 22:06:04 +0000
+++ revision	2013-03-06 18:34:21 +0000
@@ -1,1 +1,1 @@
-28
+29
 
=== modified file 'scripts/write_config.py'
--- scripts/write_config.py	2013-03-04 22:06:04 +0000
+++ scripts/write_config.py	2013-03-06 18:34:21 +0000
@@ -6,8 +6,11 @@
 import subprocess
 import sys
 
-from charmsupport.hookenv import related_units
-from charmsupport.hookenv import relation_ids
+from charmsupport.hookenv import (
+    config,
+    related_units,
+    relation_ids,
+)
 
 
 def read_config(files):
@@ -16,9 +19,13 @@
     return new_config
 
 
-def write_new_config(mongo_url, error_handler, default, override, target):
+def write_new_config(mongo_url, error_handler, charm_import_limit, default,
+                     override, target):
     new_config = read_config([default, override])
     new_config.set('app:main', 'mongo.url', mongo_url)
+    charm_import_limit = (
+        str(charm_import_limit) if charm_import_limit >=0 else "")
+    new_config.set('app:main', 'charm_import_limit', charm_import_limit)
     handler_class, handler_args = error_handler
     new_config.set('handler_exc_smtp', 'class', handler_class)
     new_config.set('handler_exc_smtp', 'args', handler_args)
@@ -90,7 +97,8 @@
 def main():
     if len(sys.argv) < 4:
         raise UsageError('Usage: %s DEFAULTS OVERRIDES TARGET')
-    write_new_config(get_mongo_url(), get_error_handler(),
+    charm_import_limit = config()['charm_import_limit']
+    write_new_config(get_mongo_url(), get_error_handler(), charm_import_limit,
                      default=sys.argv[1], override=sys.argv[2],
                      target=sys.argv[3])