You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/11/15 19:54:58 UTC
git commit: updated refs/heads/4.2-workplace to fb7e674
Updated Branches:
refs/heads/4.2-workplace 5d13a07db -> fb7e674b6
Sorted out all of the log locations
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fb7e674b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fb7e674b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fb7e674b
Branch: refs/heads/4.2-workplace
Commit: fb7e674b665e1c497076c03b174e676467ed374a
Parents: 5d13a07
Author: Alex Huang <al...@citrix.com>
Authored: Fri Nov 15 10:54:41 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Fri Nov 15 10:54:41 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/fb7e674b/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 16f2a50..625265b 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/run/cloud'):
- os.makedirs('/var/run/cloud')
+ if not os.path.exists('/var/log/cloud'):
+ os.makedirs('/var/log/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/run/cloud/" + vmName +".log"
+ logfilename = "/var/log/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/run/cloud/" + vm_name +".ip"
+ logfilename = "/var/log/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/run/cloud/" + vm_name +".ip"
+ logfilename = "/var/log/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/run/cloud/" + vm_name +".log"
+ logfilename = "/var/log/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/run/cloud/" + vm_name +".log"
+ logfilename = "/var/log/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/run/cloud/" + vm_name +".log"
+ logfilename = "/var/log/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/run/cloud/" + vm_name +".log"
+ logfilename = "/var/log/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/run/cloud/"+vm_name+".ip"
+ logfilename = "/var/log/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/run/cloud/"+vm_name+".ip"
+ logfilename = "/var/log/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/run/cloud/" + vm_name +".log"
+ logfilename = "/var/log/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/run/cloud/" + vm_name +".log"
+ logfilename = "/var/log/cloud/" + vm_name +".log"
result = True
try:
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fb7e674b/scripts/vm/hypervisor/xenserver/cloudlog
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/cloudlog b/scripts/vm/hypervisor/xenserver/cloudlog
index 9202253..75f5824 100644
--- a/scripts/vm/hypervisor/xenserver/cloudlog
+++ b/scripts/vm/hypervisor/xenserver/cloudlog
@@ -1,10 +1,10 @@
-/var/log/cloud-plugins.log {
+/var/log/cloud/cloud-plugins.log {
daily
size 1M
rotate 20
}
-/var/log/cloud-ovstunnel.log /var/log/cloud-ovs-pvlan.log {
+/var/log/cloud/cloud-ovstunnel.log /var/log/cloud/cloud-ovs-pvlan.log {
daily
size 1M
rotate 2