Bug692833 - added searchRoot to orphansubmitter

mozilla-services · Oct 7, 2011 · a2dcde1 · a2dcde1
1 parent f8f2a31
commit a2dcde1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/scripts/config/orphansubmitterconf.py.dist b/scripts/config/orphansubmitterconf.py.dist
@@ -1,17 +1,6 @@
 import stat
 import socorro.lib.ConfigurationManager as cm
 
-#-------------------------------------------------------------------------------
-# general
-
-numberOfThreads = cm.Option()
-numberOfThreads.doc = 'the number of threads to use'
-numberOfThreads.default = 4
-
-dryrun = cm.Option()
-dryrun.doc = "if True, don't actually move things into destination"
-dryrun.default = False
-
 #-------------------------------------------------------------------------------
 # source storage
 
@@ -46,6 +35,21 @@ from config.commonconfig import hbaseHost
 from config.commonconfig import hbasePort
 from config.commonconfig import hbaseTimeout
 
+#-------------------------------------------------------------------------------
+# general
+
+searchRoot = cm.Option()
+searchRoot.doc = 'the file system root at which to start the orphan search'
+searchRoot.default = localFS.default
+
+numberOfThreads = cm.Option()
+numberOfThreads.doc = 'the number of threads to use'
+numberOfThreads.default = 4
+
+dryrun = cm.Option()
+dryrun.doc = "if True, don't actually move things into destination"
+dryrun.default = False
+
 #-------------------------------------------------------------------------------
 # logging
 

diff --git a/socorro/storage/orphans.py b/socorro/storage/orphans.py
@@ -25,7 +25,7 @@ def theIterator():
     yielding the ooids of every new entry in the filelsystem.  If there
     are no new entries, it yields None"""
     destinationCrashStore = crashStoragePoolForDest.crashStorage()
-    for dir,dirs,files in os.walk(conf.localFS):
+    for dir,dirs,files in os.walk(conf.searchRoot):
       print dir, files
       for aFile in files:
         if aFile.endswith('json'):