hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-15 22:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete service.server from db when they stop

Browse Source 
same ondelete='SET NULL' as on spawner.server
This commit is contained in:
Min RK
2017-09-14 13:30:24 +02:00
parent 78ac5abf23
commit f11705ee26
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jupyterhub/orm.py
View File

@@ -213,7 +213,7 @@ class Service(Base):
api_tokens = relationship("APIToken", backref="service") api_tokens = relationship("APIToken", backref="service")
# service-specific interface # service-specific interface
_server_id = Column(Integer, ForeignKey('servers.id')) _server_id = Column(Integer, ForeignKey('servers.id', ondelete='SET NULL'))
server = relationship(Server, primaryjoin=_server_id == Server.id) server = relationship(Server, primaryjoin=_server_id == Server.id)
pid = Column(Integer) pid = Column(Integer)

3
jupyterhub/services/service.py
View File

@@ -301,5 +301,8 @@ class Service(LoggingConfigurable):
if not self.managed: if not self.managed:
raise RuntimeError("Cannot stop unmanaged service %s" % self) raise RuntimeError("Cannot stop unmanaged service %s" % self)
if self.spawner: if self.spawner:
if self.orm.server:
self.db.delete(self.orm.server)
self.db.commit()
self.spawner.stop_polling() self.spawner.stop_polling()
return self.spawner.stop() return self.spawner.stop()