|
@ -136,19 +136,27 @@ def find_existing_instances( **kwargs ): |
|
|
dup = models.Mumble.objects.get( addr=instance.addr, port=instance.port ) |
|
|
dup = models.Mumble.objects.get( addr=instance.addr, port=instance.port ) |
|
|
except Mumble.DoesNotExist: |
|
|
except Mumble.DoesNotExist: |
|
|
# None exist - this must've been something else. |
|
|
# None exist - this must've been something else. |
|
|
|
|
|
print "Server ID / Name: %d / %s" % ( instance.srvid, instance.name ) |
|
|
raise err |
|
|
raise err |
|
|
else: |
|
|
else: |
|
|
print "ERROR: There is already another server instance registered" |
|
|
print "ERROR: There is already another server instance registered" |
|
|
print " on the same address and port." |
|
|
print " on the same address and port." |
|
|
|
|
|
print " -------------" |
|
|
|
|
|
print " New Server ID:", instance.srvid, |
|
|
print " New Server Name:", instance.name |
|
|
print " New Server Name:", instance.name |
|
|
print " Address:", instance.addr |
|
|
print " Address:", instance.addr |
|
|
print " Port:", instance.port |
|
|
print " Port:", instance.port |
|
|
print " Connection string:", instance.server.dbus |
|
|
print " Connection string:", instance.server.dbus |
|
|
|
|
|
print " -------------" |
|
|
|
|
|
print " Duplicate Server ID:", dup.srvid, |
|
|
print "Duplicate Server Name:", dup.name |
|
|
print "Duplicate Server Name:", dup.name |
|
|
print " Address:", dup.addr |
|
|
print " Address:", dup.addr |
|
|
print " Port:", dup.port |
|
|
print " Port:", dup.port |
|
|
print " Connection string:", dup.server.dbus |
|
|
print " Connection string:", dup.server.dbus |
|
|
return False |
|
|
return False |
|
|
|
|
|
except Exception, err: |
|
|
|
|
|
print "Server ID / Name: %d / %s" % ( instance.srvid, instance.name ) |
|
|
|
|
|
raise err |
|
|
|
|
|
|
|
|
# Now search for players on this server that have not yet been registered |
|
|
# Now search for players on this server that have not yet been registered |
|
|
if instance.booted: |
|
|
if instance.booted: |
|
|