cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [1/2] git commit: updated refs/heads/4.2-workplace to 0a0e86d
Date Fri, 15 Nov 2013 19:36:04 GMT
Updated Branches:
  refs/heads/4.2-workplace fb7e674b6 -> 0a0e86d16


Revert "Sorted out all of the log locations"
Anthony explained to me all the stuff in /var/run/cloud/*.log are not actually logs.

This reverts commit fb7e674b665e1c497076c03b174e676467ed374a.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/60c43b3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/60c43b3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/60c43b3e

Branch: refs/heads/4.2-workplace
Commit: 60c43b3e403a22d20e442b4a406fb4c37b30ba2e
Parents: fb7e674
Author: Alex Huang <alex.huang@citrix.com>
Authored: Fri Nov 15 11:34:08 2013 -0800
Committer: Alex Huang <alex.huang@citrix.com>
Committed: Fri Nov 15 11:34:08 2013 -0800

----------------------------------------------------------------------
 .../hypervisor/xenserver/cloud-plugin-generic   | 26 ++++++++++----------
 scripts/vm/hypervisor/xenserver/cloudlog        |  4 +--
 2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60c43b3e/scripts/vm/hypervisor/xenserver/cloud-plugin-generic
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/cloud-plugin-generic b/scripts/vm/hypervisor/xenserver/cloud-plugin-generic
index 625265b..16f2a50 100644
--- a/scripts/vm/hypervisor/xenserver/cloud-plugin-generic
+++ b/scripts/vm/hypervisor/xenserver/cloud-plugin-generic
@@ -449,8 +449,8 @@ def can_bridge_firewall(session, args):
             return 'false'
     default_ebtables_rules()
     allow_egress_traffic(session)
-    if not os.path.exists('/var/log/cloud'):
-        os.makedirs('/var/log/cloud')
+    if not os.path.exists('/var/run/cloud'):
+        os.makedirs('/var/run/cloud')
     if not os.path.exists('/var/cache/cloud'):
         os.makedirs('/var/cache/cloud')
     #get_ipset_keyword()
@@ -990,7 +990,7 @@ def check_domid_changed(session, vmName):
         logging.debug("### Failed to get domid for vm  ## " + vmName)
         
     
-    logfilename = "/var/log/cloud/" + vmName +".log"
+    logfilename = "/var/run/cloud/" + vmName +".log"
     if not os.path.exists(logfilename):
         return ['-1', curr_domid]
     
@@ -1108,7 +1108,7 @@ def network_rules_for_rebooted_vm(session, vmName):
 
 @echo
 def get_vm_sec_ips(vm_name):
-    logfilename = "/var/log/cloud/" + vm_name +".ip"
+    logfilename = "/var/run/cloud/" + vm_name +".ip"
 
     lines = (line.rstrip() for line in open(logfilename))
     for line in lines:
@@ -1123,7 +1123,7 @@ def get_vm_sec_ips(vm_name):
 
 @echo
 def is_secondary_ips_set(vm_name):
-    logfilename = "/var/log/cloud/" + vm_name +".ip"
+    logfilename = "/var/run/cloud/" + vm_name +".ip"
     if not os.path.exists(logfilename):
         return False
 
@@ -1131,7 +1131,7 @@ def is_secondary_ips_set(vm_name):
 
 @echo
 def rewrite_rule_log_for_vm(vm_name, new_domid):
-    logfilename = "/var/log/cloud/" + vm_name +".log"
+    logfilename = "/var/run/cloud/" + vm_name +".log"
     if not os.path.exists(logfilename):
         return 
     lines = (line.rstrip() for line in open(logfilename))
@@ -1148,7 +1148,7 @@ def rewrite_rule_log_for_vm(vm_name, new_domid):
 
 def get_rule_log_for_vm(session, vmName):
     vm_name = vmName;
-    logfilename = "/var/log/cloud/" + vm_name +".log"
+    logfilename = "/var/run/cloud/" + vm_name +".log"
     if not os.path.exists(logfilename):
         return ''
     
@@ -1167,7 +1167,7 @@ def get_rule_log_for_vm(session, vmName):
 @echo
 def get_vm_mac_ip_from_log(vm_name):
     [_vmName,_vmID,_vmIP,_domID,_signature,_seqno,_vmMac] = ['_', '-1', '0.0.0.0', '-1',
'_', '-1','ff:ff:ff:ff:ff:ff']
-    logfilename = "/var/log/cloud/" + vm_name +".log"
+    logfilename = "/var/run/cloud/" + vm_name +".log"
     if not os.path.exists(logfilename):
         return ['_', '_']
     
@@ -1272,7 +1272,7 @@ def cleanup_rules(session, args):
 @echo
 def check_rule_log_for_vm(vmName, vmID, vmIP, domID, signature, seqno):
     vm_name = vmName;
-    logfilename = "/var/log/cloud/" + vm_name +".log"
+    logfilename = "/var/run/cloud/" + vm_name +".log"
     if not os.path.exists(logfilename):
         logging.debug("Failed to find logfile %s" %logfilename)
         return [True, True, True]
@@ -1329,7 +1329,7 @@ def check_rule_log_for_vm(vmName, vmID, vmIP, domID, signature, seqno):
 @echo
 def write_secip_log_for_vm (vmName, secIps, vmId):
     vm_name = vmName
-    logfilename = "/var/log/cloud/"+vm_name+".ip"
+    logfilename = "/var/run/cloud/"+vm_name+".ip"
     logging.debug("Writing log to " + logfilename)
     logf = open(logfilename, 'w')
     output = ','.join([vmName, secIps, vmId])
@@ -1349,7 +1349,7 @@ def write_secip_log_for_vm (vmName, secIps, vmId):
 @echo
 def remove_secip_log_for_vm(vmName):
     vm_name = vmName
-    logfilename = "/var/log/cloud/"+vm_name+".ip"
+    logfilename = "/var/run/cloud/"+vm_name+".ip"
 
     result = True
     try:
@@ -1363,7 +1363,7 @@ def remove_secip_log_for_vm(vmName):
 @echo
 def write_rule_log_for_vm(vmName, vmID, vmIP, domID, signature, seqno, vmMac='ff:ff:ff:ff:ff:ff'):
     vm_name = vmName
-    logfilename = "/var/log/cloud/" + vm_name +".log"
+    logfilename = "/var/run/cloud/" + vm_name +".log"
     logging.debug("Writing log to " + logfilename)
     logf = open(logfilename, 'w')
     output = ','.join([vmName, vmID, vmIP, domID, signature, seqno, vmMac])
@@ -1382,7 +1382,7 @@ def write_rule_log_for_vm(vmName, vmID, vmIP, domID, signature, seqno,
vmMac='ff
 @echo
 def remove_rule_log_for_vm(vmName):
     vm_name = vmName
-    logfilename = "/var/log/cloud/" + vm_name +".log"
+    logfilename = "/var/run/cloud/" + vm_name +".log"
 
     result = True
     try:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60c43b3e/scripts/vm/hypervisor/xenserver/cloudlog
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/cloudlog b/scripts/vm/hypervisor/xenserver/cloudlog
index 75f5824..9202253 100644
--- a/scripts/vm/hypervisor/xenserver/cloudlog
+++ b/scripts/vm/hypervisor/xenserver/cloudlog
@@ -1,10 +1,10 @@
-/var/log/cloud/cloud-plugins.log {
+/var/log/cloud-plugins.log {
     daily
     size 1M
     rotate 20
 }
 
-/var/log/cloud/cloud-ovstunnel.log /var/log/cloud/cloud-ovs-pvlan.log {
+/var/log/cloud-ovstunnel.log /var/log/cloud-ovs-pvlan.log {
     daily
     size 1M
     rotate 2


Mime
View raw message