Changeset - 56a8434a88cc
Parent rev.
Child rev.
[Not reviewed]
beta
0 4 0
Marcin Kuzminski - 15 years ago 2010-11-07 15:06:43
marcin@python-works.com
fixes #51 deleting a repo didn't delete it's dependent db entries.
fixed routes logger double entries
4 files changed with 6 insertions and 1 deletions:
development.ini
1
production.ini
1
rhodecode/config/deployment.ini_tmpl
1
rhodecode/model/db.py
3
1
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
@@ -91,83 +91,84 @@ beaker.session.auto = False
 

			




	
	
	
		
 
    

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##

			




	
	
	
		
 
## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##

			




	
	
	
		
 
## execute malicious code after an exception is raised.                       ##

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
#set debug = false

			




	
	
	
		
 

			




	
	
	
		
 
##################################

			




	
	
	
		
 
###       LOGVIEW CONFIG       ###

			




	
	
	
		
 
##################################

			




	
	
	
		
 
logview.sqlalchemy = #faa

			




	
	
	
		
 
logview.pylons.templating = #bfb

			




	
	
	
		
 
logview.pylons.util = #eee

			




	
	
	
		
 

			




	
	
	
		
 
#########################################################

			




	
	
	
		
 
### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###

			




	
	
	
		
 
#########################################################

			




	
	
	
		
 
sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db

			




	
	
	
		
 
#sqlalchemy.db1.echo = False

			




	
	
	
		
 
#sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.convert_unicode = true

			




	
	
	
		
 

			




	
	
	
		
 
################################

			




	
	
	
		
 
### LOGGING CONFIGURATION   ####

			




	
	
	
		
 
################################

			




	
	
	
		
 
[loggers]

			




	
	
	
		
 
keys = root, routes, rhodecode, sqlalchemy

			




	
	
	
		
 

			




	
	
	
		
 
[handlers]

			




	
	
	
		
 
keys = console

			




	
	
	
		
 

			




	
	
	
		
 
[formatters]

			




	
	
	
		
 
keys = generic,color_formatter

			




	
	
	
		
 

			




	
	
	
		
 
#############

			




	
	
	
		
 
## LOGGERS ##

			




	
	
	
		
 
#############

			




	
	
	
		
 
[logger_root]

			




	
	
	
		
 
level = NOTSET

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 

			




	
	
	
		
 
[logger_routes]

			




	
	
	
		
 
level = DEBUG

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 
qualname = routes.middleware

			




	
	
	
		
 
# "level = DEBUG" logs the route matched and routing variables.

			




	
	
	
		
 
propagate = 0

			




	
	
	
		
 

			




	
	
	
		
 
[logger_rhodecode]

			




	
	
	
		
 
level = DEBUG

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 
qualname = rhodecode

			




	
	
	
		
 
propagate = 0

			




	
	
	
		
 

			




	
	
	
		
 
[logger_sqlalchemy]

			




	
	
	
		
 
level = ERROR

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 
qualname = sqlalchemy.engine

			




	
	
	
		
 
propagate = 0

			




	
	
	
		
 

			




	
	
	
		
 
##############

			




	
	
	
		
 
## HANDLERS ##

			




	
	
	
		
 
##############

			




	
	
	
		
 

			




	
	
	
		
 
[handler_console]

			




	
	
	
		
 
class = StreamHandler

			




	
	
	
		
 
args = (sys.stderr,)

			




	
	
	
		
 
level = NOTSET

			




	
	
	
		
 
formatter = color_formatter

			




	
	
	
		
 

			




	
	
	
		
 
################

			




	
	
	
		
 
## FORMATTERS ##

			




	
	
	
		
 
################

			




	
	
	
		
 

			




	
	
	
		
 
[formatter_generic]

			




	
	
	
		
 
format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s

			




	
	
	
		
 
datefmt = %Y-%m-%d %H:%M:%S

			




	
	
	
		
 

			




	
	
	
		
 
[formatter_color_formatter]

			




	
	
	
		
 
class=rhodecode.lib.colored_formatter.ColorFormatter

			




	
	
	
		
 
format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s

			




	
	
	
		
 
datefmt = %Y-%m-%d %H:%M:%S

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    production.ini
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -91,83 +91,84 @@ beaker.session.auto = False

			




	
	
	
		
 

			




	
	
	
		
 
    

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##

			




	
	
	
		
 
## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##

			




	
	
	
		
 
## execute malicious code after an exception is raised.                       ##

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
set debug = false

			




	
	
	
		
 

			




	
	
	
		
 
##################################

			




	
	
	
		
 
###       LOGVIEW CONFIG       ###

			




	
	
	
		
 
##################################

			




	
	
	
		
 
logview.sqlalchemy = #faa

			




	
	
	
		
 
logview.pylons.templating = #bfb

			




	
	
	
		
 
logview.pylons.util = #eee

			




	
	
	
		
 

			




	
	
	
		
 
#########################################################

			




	
	
	
		
 
### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###

			




	
	
	
		
 
#########################################################

			




	
	
	
		
 
sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db

			




	
	
	
		
 
#sqlalchemy.db1.echo = False

			




	
	
	
		
 
#sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.convert_unicode = true

			




	
	
	
		
 

			




	
	
	
		
 
################################

			




	
	
	
		
 
### LOGGING CONFIGURATION   ####

			




	
	
	
		
 
################################

			




	
	
	
		
 
[loggers]

			




	
	
	
		
 
keys = root, routes, rhodecode, sqlalchemy

			




	
	
	
		
 

			




	
	
	
		
 
[handlers]

			




	
	
	
		
 
keys = console

			




	
	
	
		
 

			




	
	
	
		
 
[formatters]

			




	
	
	
		
 
keys = generic,color_formatter

			




	
	
	
		
 

			




	
	
	
		
 
#############

			




	
	
	
		
 
## LOGGERS ##

			




	
	
	
		
 
#############

			




	
	
	
		
 
[logger_root]

			




	
	
	
		
 
level = INFO

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 

			




	
	
	
		
 
[logger_routes]

			




	
	
	
		
 
level = INFO

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 
qualname = routes.middleware

			




	
	
	
		
 
# "level = DEBUG" logs the route matched and routing variables.

			




	
	
	
		
 
propagate = 0

			




	
	
	
		
 

			




	
	
	
		
 
[logger_rhodecode]

			




	
	
	
		
 
level = DEBUG

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 
qualname = rhodecode

			




	
	
	
		
 
propagate = 0

			




	
	
	
		
 

			




	
	
	
		
 
[logger_sqlalchemy]

			




	
	
	
		
 
level = ERROR

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 
qualname = sqlalchemy.engine

			




	
	
	
		
 
propagate = 0

			




	
	
	
		
 

			




	
	
	
		
 
##############

			




	
	
	
		
 
## HANDLERS ##

			




	
	
	
		
 
##############

			




	
	
	
		
 

			




	
	
	
		
 
[handler_console]

			




	
	
	
		
 
class = StreamHandler

			




	
	
	
		
 
args = (sys.stderr,)

			




	
	
	
		
 
level = NOTSET

			




	
	
	
		
 
formatter = color_formatter

			




	
	
	
		
 

			




	
	
	
		
 
################

			




	
	
	
		
 
## FORMATTERS ##

			




	
	
	
		
 
################

			




	
	
	
		
 

			




	
	
	
		
 
[formatter_generic]

			




	
	
	
		
 
format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s

			




	
	
	
		
 
datefmt = %Y-%m-%d %H:%M:%S

			




	
	
	
		
 

			




	
	
	
		
 
[formatter_color_formatter]

			




	
	
	
		
 
class=rhodecode.lib.colored_formatter.ColorFormatter

			




	
	
	
		
 
format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s

			




	
	
	
		
 
datefmt = %Y-%m-%d %H:%M:%S

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    rhodecode/config/deployment.ini_tmpl
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -91,83 +91,84 @@ beaker.session.auto = False

			




	
	
	
		
 

			




	
	
	
		
 
    

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##

			




	
	
	
		
 
## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##

			




	
	
	
		
 
## execute malicious code after an exception is raised.                       ##

			




	
	
	
		
 
################################################################################

			




	
	
	
		
 
set debug = false

			




	
	
	
		
 

			




	
	
	
		
 
##################################

			




	
	
	
		
 
###       LOGVIEW CONFIG       ###

			




	
	
	
		
 
##################################

			




	
	
	
		
 
logview.sqlalchemy = #faa

			




	
	
	
		
 
logview.pylons.templating = #bfb

			




	
	
	
		
 
logview.pylons.util = #eee

			




	
	
	
		
 

			




	
	
	
		
 
#########################################################

			




	
	
	
		
 
### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###

			




	
	
	
		
 
#########################################################

			




	
	
	
		
 
sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db

			




	
	
	
		
 
#sqlalchemy.db1.echo = False

			




	
	
	
		
 
#sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.convert_unicode = true

			




	
	
	
		
 

			




	
	
	
		
 
################################

			




	
	
	
		
 
### LOGGING CONFIGURATION   ####

			




	
	
	
		
 
################################

			




	
	
	
		
 
[loggers]

			




	
	
	
		
 
keys = root, routes, rhodecode, sqlalchemy

			




	
	
	
		
 

			




	
	
	
		
 
[handlers]

			




	
	
	
		
 
keys = console

			




	
	
	
		
 

			




	
	
	
		
 
[formatters]

			




	
	
	
		
 
keys = generic,color_formatter

			




	
	
	
		
 

			




	
	
	
		
 
#############

			




	
	
	
		
 
## LOGGERS ##

			




	
	
	
		
 
#############

			




	
	
	
		
 
[logger_root]

			




	
	
	
		
 
level = INFO

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 

			




	
	
	
		
 
[logger_routes]

			




	
	
	
		
 
level = INFO

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 
qualname = routes.middleware

			




	
	
	
		
 
# "level = DEBUG" logs the route matched and routing variables.

			




	
	
	
		
 
propagate = 0

			




	
	
	
		
 

			




	
	
	
		
 
[logger_rhodecode]

			




	
	
	
		
 
level = DEBUG

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 
qualname = rhodecode

			




	
	
	
		
 
propagate = 0

			




	
	
	
		
 

			




	
	
	
		
 
[logger_sqlalchemy]

			




	
	
	
		
 
level = ERROR

			




	
	
	
		
 
handlers = console

			




	
	
	
		
 
qualname = sqlalchemy.engine

			




	
	
	
		
 
propagate = 0

			




	
	
	
		
 

			




	
	
	
		
 
##############

			




	
	
	
		
 
## HANDLERS ##

			




	
	
	
		
 
##############

			




	
	
	
		
 

			




	
	
	
		
 
[handler_console]

			




	
	
	
		
 
class = StreamHandler

			




	
	
	
		
 
args = (sys.stderr,)

			




	
	
	
		
 
level = NOTSET

			




	
	
	
		
 
formatter = color_formatter

			




	
	
	
		
 

			




	
	
	
		
 
################

			




	
	
	
		
 
## FORMATTERS ##

			




	
	
	
		
 
################

			




	
	
	
		
 

			




	
	
	
		
 
[formatter_generic]

			




	
	
	
		
 
format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s

			




	
	
	
		
 
datefmt = %Y-%m-%d %H:%M:%S

			




	
	
	
		
 

			




	
	
	
		
 
[formatter_color_formatter]

			




	
	
	
		
 
class=rhodecode.lib.colored_formatter.ColorFormatter

			




	
	
	
		
 
format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s

			




	
	
	
		
 
datefmt = %Y-%m-%d %H:%M:%S

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    rhodecode/model/db.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -43,96 +43,98 @@ class User(Base):

			




	
	
	
		
 
    def full_contact(self):

			




	
	
	
		
 
        return '%s %s <%s>' % (self.name, self.lastname, self.email)

			




	
	
	
		
 

			




	
	
	
		
 
    def __repr__(self):

			




	
	
	
		
 
        return "<User('id:%s:%s')>" % (self.user_id, self.username)

			




	
	
	
		
 

			




	
	
	
		
 
    def update_lastlogin(self):

			




	
	
	
		
 
        """Update user lastlogin"""

			




	
	
	
		
 
        import datetime

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            session = Session.object_session(self)

			




	
	
	
		
 
            self.last_login = datetime.datetime.now()

			




	
	
	
		
 
            session.add(self)

			




	
	
	
		
 
            session.commit()

			




	
	
	
		
 
            log.debug('updated user %s lastlogin', self.username)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            session.rollback()

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserLog(Base):

			




	
	
	
		
 
    __tablename__ = 'user_logs'

			




	
	
	
		
 
    __table_args__ = {'useexisting':True}

			




	
	
	
		
 
    user_log_id = Column("user_log_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    repository_id = Column("repository_id", INTEGER(length=None, convert_unicode=False, assert_unicode=None), ForeignKey(u'repositories.repo_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    repository_name = Column("repository_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    user_ip = Column("user_ip", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    action = Column("action", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    action_date = Column("action_date", DATETIME(timezone=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relation('User')

			




	
	
	
		
 
    repository = relation('Repository')

			




	
	
	
		
 

			




	
	
	
		
 
class Repository(Base):

			




	
	
	
		
 
    __tablename__ = 'repositories'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('repo_name'), {'useexisting':True},)

			




	
	
	
		
 
    repo_id = Column("repo_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    repo_name = Column("repo_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)

			




	
	
	
		
 
    repo_type = Column("repo_type", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default=None)

			




	
	
	
		
 
    user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=False, default=None)

			




	
	
	
		
 
    private = Column("private", BOOLEAN(), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    description = Column("description", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    fork_id = Column("fork_id", INTEGER(), ForeignKey(u'repositories.repo_id'), nullable=True, unique=False, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relation('User')

			




	
	
	
		
 
    fork = relation('Repository', remote_side=repo_id)

			




	
	
	
		
 
    repo_to_perm = relation('RepoToPerm', cascade='all')

			




	
	
	
		
 
    stats = relation('Statistics', cascade='all')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __repr__(self):

			




	
	
	
		
 
        return "<Repository('id:%s:%s')>" % (self.repo_id, self.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
class Permission(Base):

			




	
	
	
		
 
    __tablename__ = 'permissions'

			




	
	
	
		
 
    __table_args__ = {'useexisting':True}

			




	
	
	
		
 
    permission_id = Column("permission_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    permission_name = Column("permission_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    permission_longname = Column("permission_longname", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    def __repr__(self):

			




	
	
	
		
 
        return "<Permission('%s:%s')>" % (self.permission_id, self.permission_name)

			




	
	
	
		
 

			




	
	
	
		
 
class RepoToPerm(Base):

			




	
	
	
		
 
    __tablename__ = 'repo_to_perm'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('user_id', 'repository_id'), {'useexisting':True})

			




	
	
	
		
 
    repo_to_perm_id = Column("repo_to_perm_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    permission_id = Column("permission_id", INTEGER(), ForeignKey(u'permissions.permission_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    repository_id = Column("repository_id", INTEGER(), ForeignKey(u'repositories.repo_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relation('User')

			




	
	
	
		
 
    permission = relation('Permission')

			




	
	
	
		
 
    repository = relation('Repository')

			




	
	
	
		
 

			




	
	
	
		
 
class UserToPerm(Base):

			




	
	
	
		
 
    __tablename__ = 'user_to_perm'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('user_id', 'permission_id'), {'useexisting':True})

			




	
	
	
		
 
    user_to_perm_id = Column("user_to_perm_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    permission_id = Column("permission_id", INTEGER(), ForeignKey(u'permissions.permission_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relation('User')

			




	
	
	
		
 
    permission = relation('Permission')

			




	
	
	
		
 

			




	
	
	
		
 
class Statistics(Base):

			




	
	
	
		
 
    __tablename__ = 'statistics'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('repository_id'), {'useexisting':True})

			




	
	
	
		
 
    stat_id = Column("stat_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    repository_id = Column("repository_id", INTEGER(), ForeignKey(u'repositories.repo_id'), nullable=False, unique=True, default=None)

			




	
	
	
		
 
    stat_on_revision = Column("stat_on_revision", INTEGER(), nullable=False)

			




	
	
	
		
 
    commit_activity = Column("commit_activity", BLOB(), nullable=False)#JSON data

			




	
	
	
		
 
    commit_activity_combined = Column("commit_activity_combined", BLOB(), nullable=False)#JSON data

			




	
	
	
		
 
    languages = Column("languages", BLOB(), nullable=False)#JSON data

			




	
	
	
		
 

			




	
	
	
		
 
    repository = relation('Repository')

			




	
	
	
		
 
    repository = relation('Repository', single_parent=True)

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.