garden

 - unified logging formatting to use only %

--HG--
branch : beta
extra : rebase_source : 3e21b92e6102c14b6d395db12fbb62a753ca7373

6 files changed, 14 insertions, 15 deletions

diff --git a/rhodecode/model/__init__.py b/rhodecode/model/__init__.py
index 90801673..5c435a2b 100644
--- a/rhodecode/model/__init__.py
+++ b/rhodecode/model/__init__.py
@@ -56,7 +56,7 @@ def init_model(engine):
 
     :param engine: engine to bind to
     """
-    log.info("initializing db for %s", engine)
+    log.info("initializing db for %s" % engine)
     meta.Base.metadata.bind = engine
 
 
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index b3808d09..d5165d45 100755
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -366,7 +366,7 @@ class User(Base, BaseModel):
         """Update user lastlogin"""
         self.last_login = datetime.datetime.now()
         Session.add(self)
-        log.debug('updated user %s lastlogin', self.username)
+        log.debug('updated user %s lastlogin' % self.username)
 
     def __json__(self):
         return dict(
@@ -682,7 +682,7 @@ class Repository(Base, BaseModel):
         repo_full_path = self.repo_full_path
         try:
             alias = get_scm(repo_full_path)[0]
-            log.debug('Creating instance of %s repository', alias)
+            log.debug('Creating instance of %s repository' % alias)
             backend = get_backend(alias)
         except VCSError:
             log.error(traceback.format_exc())
diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
index 17be634e..528936fe 100644
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -248,7 +248,7 @@ class ValidAuth(formencode.validators.FancyValidator):
             return value
         else:
             if user and user.active is False:
-                log.warning('user %s is disabled', username)
+                log.warning('user %s is disabled' % username)
                 raise formencode.Invalid(
                     self.message('disabled_account',
                     state=State_obj),
@@ -256,7 +256,7 @@ class ValidAuth(formencode.validators.FancyValidator):
                     error_dict=self.e_dict_disable
                 )
             else:
-                log.warning('user %s not authenticated', username)
+                log.warning('user %s not authenticated' % username)
                 raise formencode.Invalid(
                     self.message('invalid_password',
                     state=State_obj), value, state,
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index de81cdcf..6650de01 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -401,7 +401,7 @@ class RepoModel(BaseModel):
         :param old: old name
         :param new: new name
         """
-        log.info('renaming repo from %s to %s', old, new)
+        log.info('renaming repo from %s to %s' % (old, new))
 
         old_path = os.path.join(self.repos_path, old)
         new_path = os.path.join(self.repos_path, new)
@@ -420,7 +420,7 @@ class RepoModel(BaseModel):
         :param repo: repo object
         """
         rm_path = os.path.join(self.repos_path, repo.repo_name)
-        log.info("Removing %s", rm_path)
+        log.info("Removing %s" % (rm_path))
         # disable hg/git
         alias = repo.repo_type
         shutil.move(os.path.join(rm_path, '.%s' % alias),
diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py
index 02882c69..e0de7076 100644
--- a/rhodecode/model/repos_group.py
+++ b/rhodecode/model/repos_group.py
@@ -58,7 +58,7 @@ class ReposGroupModel(BaseModel):
         """
 
         create_path = os.path.join(self.repos_path, group_name)
-        log.debug('creating new group in %s', create_path)
+        log.debug('creating new group in %s' % create_path)
 
         if os.path.isdir(create_path):
             raise Exception('That directory already exists !')
@@ -76,13 +76,12 @@ class ReposGroupModel(BaseModel):
             log.debug('skipping group rename')
             return
 
-        log.debug('renaming repos group from %s to %s', old, new)
-
+        log.debug('renaming repos group from %s to %s' % (old, new))
 
         old_path = os.path.join(self.repos_path, old)
         new_path = os.path.join(self.repos_path, new)
 
-        log.debug('renaming repos paths from %s to %s', old_path, new_path)
+        log.debug('renaming repos paths from %s to %s' % (old_path, new_path))
 
         if os.path.isdir(new_path):
             raise Exception('Was trying to rename to already '
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index 8ffb465b..59dbc871 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -110,13 +110,13 @@ class UserModel(BaseModel):
 
         from rhodecode.lib.auth import get_crypt_password
 
-        log.debug('Checking for %s account in RhodeCode database', username)
+        log.debug('Checking for %s account in RhodeCode database' % username)
         user = User.get_by_username(username, case_insensitive=True)
         if user is None:
-            log.debug('creating new user %s', username)
+            log.debug('creating new user %s' % username)
             new_user = User()
         else:
-            log.debug('updating user %s', username)
+            log.debug('updating user %s' % username)
             new_user = user
 
         try:
@@ -327,7 +327,7 @@ class UserModel(BaseModel):
                 dbuser = self.get(user_id)
 
             if dbuser is not None and dbuser.active:
-                log.debug('filling %s data', dbuser)
+                log.debug('filling %s data' % dbuser)
                 for k, v in dbuser.get_dict().items():
                     setattr(auth_user, k, v)
             else: