Indentation and arbitrary sysctls.

diff --git a/sliver_vs.py b/sliver_vs.py
index 8eed4ea..5573984 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -229,21 +229,21 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         cpu_pct = self.rspec['cpu_pct']
         cpu_share = self.rspec['cpu_share']
 
-       if setup:
-          for key in self.rspec.keys():
-            if key.find('sysctl.') == 0:
-                sysctl=key.split('.')
-                try:
-                   logger.log("%s: opening /proc/sys/%s/%s"%(self.name,sysctl[1],sysctl[2]))
-                   path="/proc/sys/%s/%s" % (sysctl[1],sysctl[2])
-                   flags = os.O_WRONLY
-                   fd = os.open(path, flags)
-                   logger.log("%s: writing %s=%s"%(self.name,key,self.rspec[key]))
-                   os.write(fd,self.rspec[key])
-                   os.close(fd)
-                except IOError, e:
-                   logger.log("%s: could not set %s=%s"%(self.name,key,self.rspec[key]))
-                   logger.log("%s: error = %s"%(self.name,e))
+        if setup:
+            for key in self.rspec.keys():
+                if key.find('sysctl.') == 0:
+                    sysctl=key.split('.')
+                    try:
+                        path="/proc/sys/%s" % ("/".join(sysctl[1:]))
+                        logger.log("%s: opening %s"%(self.name,path))
+                        flags = os.O_WRONLY
+                        fd = os.open(path, flags)
+                        logger.log("%s: writing %s=%s"%(self.name,key,self.rspec[key]))
+                        os.write(fd,self.rspec[key])
+                        os.close(fd)
+                    except IOError, e:
+                        logger.log("%s: could not set %s=%s"%(self.name,key,self.rspec[key]))
+                        logger.log("%s: error = %s"%(self.name,e))
 
 
         if self.rspec['enabled'] > 0:

diff --git a/sm.py b/sm.py
index 3dfed2f..45644d8 100644 (file)
--- a/sm.py
+++ b/sm.py
@@ -128,9 +128,9 @@ def GetSlivers(data, fullupdate=True):
             rspec[resname] = amt
 
         # add in sysctl attributes into the rspec
-       for key in attr_dict.keys():
-           if key.find("sysctl.") == 0:
-               rspec[key] = attr_dict[key]
+        for key in attr_dict.keys():
+            if key.find("sysctl.") == 0:
+                rspec[key] = attr_dict[key]
 
         database.db.deliver_record(rec)
     if fullupdate: database.db.set_min_timestamp(data['timestamp'])