You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/11/19 10:14:08 UTC
[2/3] stratos git commit: Add debug logs to print temp location in
PCA git handler
Add debug logs to print temp location in PCA git handler
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/55add585
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/55add585
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/55add585
Branch: refs/heads/stratos-4.1.x
Commit: 55add58563a66b13466e5ed79cb2d7ec365e0282
Parents: aa21115
Author: Akila Perera <ra...@gmail.com>
Authored: Thu Nov 19 14:38:06 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Thu Nov 19 14:43:31 2015 +0530
----------------------------------------------------------------------
.../modules/artifactmgt/git/agentgithandler.py | 24 ++++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/55add585/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
index 59c25d9..c283011 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
@@ -15,22 +15,22 @@
# specific language governing permissions and limitations
# under the License.
-from threading import current_thread
-import subprocess
import shutil
-import time
-import os
+import subprocess
import tempfile
-from git import *
import urllib
+import os
+from distutils.dir_util import copy_tree
+from threading import current_thread
import constants
+import time
from config import Config
-from ...util.log import LogFactory
-from ...util.asyncscheduledtask import AbstractAsyncScheduledTask, ScheduledExecutor
-from ...artifactmgt.repository import Repository
from exception import GitRepositorySynchronizationException
-from distutils.dir_util import copy_tree
+from git import *
+
+from ...util.asyncscheduledtask import AbstractAsyncScheduledTask, ScheduledExecutor
+from ...util.log import LogFactory
class AgentGitHandler:
@@ -44,6 +44,7 @@ class AgentGitHandler:
log = LogFactory().get_log(__name__)
__git_repositories = {}
+
# (tenant_id => GitRepository)
@staticmethod
@@ -143,11 +144,14 @@ class AgentGitHandler:
def clone(git_repo):
try:
# create a temporary location to clone
- temp_repo_path = os.path.join(tempfile.gettempdir(), "pca-temp-" + git_repo.tenant_id)
+ temp_repo_path = os.path.join(tempfile.gettempdir(), "pca_temp_" + git_repo.tenant_id)
if os.path.isdir(temp_repo_path) and os.listdir(temp_repo_path) != []:
GitUtils.delete_folder_tree(temp_repo_path)
GitUtils.create_dir(temp_repo_path)
+
# clone the repo to a temporary location first to avoid conflicts
+ AgentGitHandler.log.debug(
+ "Cloning artifacts from URL: %s to temp location: %s" % (git_repo.repo_url, temp_repo_path))
Repo.clone_from(git_repo.repo_url, temp_repo_path)
# move the cloned dir to application path