tildetown
/
tildetown-admin
1
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

fix logging

feature/enhanced-ticket-view
nate 2018-02-24 18:35:03 -08:00
parent 169df3e84d
commit 1bdaede8c2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ttadmin/users/models.py
View File

@ -95,7 +95,7 @@ class Townie(User):
'--disabled-password', '--disabled-password',
self.username]) self.username])
if error: if error:
logging.error(error) logger.error(error)
return return
error = _guarded_run(['sudo', error = _guarded_run(['sudo',
@ -105,7 +105,7 @@ class Townie(User):
self.username]) self.username])
if error: if error:
logging.error(error) logger.error(error)
return return
# Create .ssh # Create .ssh
@ -114,7 +114,7 @@ class Townie(User):
'mkdir', 'mkdir',
dot_ssh_path]) dot_ssh_path])
if error: if error:
logging.error(error) logger.error(error)
return return
def write_authorized_keys(self): def write_authorized_keys(self):
@ -138,7 +138,7 @@ class Townie(User):
self.username], self.username],
stdin=fp) stdin=fp)
if error: if error:
logging.error(error) logger.error(error)
def generate_authorized_keys(self): def generate_authorized_keys(self):
"""returns a string suitable for writing out to an authorized_keys """returns a string suitable for writing out to an authorized_keys
@ -161,9 +161,9 @@ class Townie(User):
old_username, old_username,
self.username]) self.username])
if error: if error:
logging.error(error) logger.error(error)
return return
logging.info('Renamed {} to {}'.format(old_username, self.username)) logger.info('Renamed {} to {}'.format(old_username, self.username))
class Pubkey(Model): class Pubkey(Model):
@ -193,24 +193,24 @@ def on_pubkey_post_save(sender, instance, **kwargs):
@receiver(pre_save, sender=Townie) @receiver(pre_save, sender=Townie)
def on_townie_pre_save(sender, instance, **kwargs): def on_townie_pre_save(sender, instance, **kwargs):
if instance.id is None: if instance.id is None:
logging.info('Signup from {}'.format(instance.username)) logger.info('Signup from {}'.format(instance.username))
return return
existing = Townie.objects.get(id=instance.id) existing = Townie.objects.get(id=instance.id)
# See if we need to create this user on disk. # See if we need to create this user on disk.
if not existing.reviewed and instance.reviewed is True: if not existing.reviewed and instance.reviewed is True:
logging.info('Creating user {} on disk.'.format(instance.username)) logger.info('Creating user {} on disk.'.format(instance.username))
instance.create_on_disk() instance.create_on_disk()
instance.send_welcome_email() instance.send_welcome_email()
instance.write_authorized_keys() instance.write_authorized_keys()
return return
# See if this user needs a rename on disk # See if this user needs a rename on disk
logging.info('checking for rename {} vs {}'.format( logger.info('checking for rename {} vs {}'.format(
existing.username, instance.username)) existing.username, instance.username))
if existing.username != instance.username: if existing.username != instance.username:
logging.info('username do not match, going to rename') logger.info('username do not match, going to rename')
instance.rename_on_disk(existing.username) instance.rename_on_disk(existing.username)