Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-09 20:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup the threading, its a method in openfiremanager now to spawn a threaded broadcast.

Browse Source 
Also added date to the broadcast.
This commit is contained in:
Tyler274 2015-01-07 15:19:51 -05:00
parent d74ff5fc91
commit e386586fd0
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
services/managers/openfire_manager.py
View File

@ -10,11 +10,18 @@ from openfire import UserService
from authentication.managers import AuthServicesInfoManager
import threading
class OpenfireManager:
def __init__(self):
pass
@staticmethod
def send_broadcast_threaded(group_name, broadcast_message):
broadcast_thread = XmppThread(1, "XMPP Broadcast Thread", 1, group_name, broadcast_message)
broadcast_thread.start()
@staticmethod
def __add_address_to_username(username):
address = urlparse(settings.OPENFIRE_ADDRESS).netloc.split(":")[0]
@ -119,3 +126,16 @@ class OpenfireManager:
client.Process(1)
client.disconnect()
class XmppThread (threading.Thread):
def __init__(self, threadID, name, counter, group, message,):
threading.Thread.__init__(self)
self.threadID = threadID
self.name = name
self.counter = counter
self.group = group
self.message = message
def run(self):
print "Starting " + self.name
OpenfireManager.send_broadcast_message(self.group, self.message)
print "Exiting " + self.name

24
services/views.py
View File

@ -25,6 +25,7 @@ from forms import FleetFormatterForm
from util import check_if_user_has_permission
import threading
import datetime
@login_required
@ -52,19 +53,6 @@ def fleet_formatter_view(request):
return render_to_response('registered/fleetformattertool.html', context, context_instance=RequestContext(request))
class xmppThread (threading.Thread):
def __init__(self, threadID, name, counter, group, message,):
threading.Thread.__init__(self)
self.threadID = threadID
self.name = name
self.counter = counter
self.group = group
self.message = message
def run(self):
print "Starting " + self.name
OpenfireManager.send_broadcast_message(self.group, self.message)
print "Exiting " + self.name
@login_required
@permission_required('auth.jabber_broadcast')
def jabber_broadcast_view(request):
@ -75,18 +63,16 @@ def jabber_broadcast_view(request):
user_info = AuthServicesInfo.objects.get(user=request.user)
main_char = EveCharacter.objects.get(character_id=user_info.main_char_id)
if user_info.main_char_id != "":
message_to_send = form.cleaned_data['message'] + "\n##### SENT BY: " + "[" + main_char.corporation_ticker + "]" + main_char.character_name + " TO: " + form.cleaned_data['group'] + " #####\n##### Replies are NOT monitored #####\n"
message_to_send = form.cleaned_data['message'] + "\n##### SENT BY: " + "[" + main_char.corporation_ticker + "]" + main_char.character_name + " TO: " + form.cleaned_data['group'] + " WHEN: " + datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") + " #####\n##### Replies are NOT monitored #####\n"
group_to_send = form.cleaned_data['group']
broadcast_thread = xmppThread(1, "XMPP Broadcast Thread", 1, group_to_send, message_to_send)
broadcast_thread.start()
OpenfireManager.send_broadcast_threaded(group_to_send, message_to_send,)
else:
message_to_send = form.cleaned_data['message'] + "\n##### SENT BY: " + "No character but can send pings?" + " TO: " + form.cleaned_data['group'] + " #####\n##### Replies are NOT monitored #####\n"
message_to_send = form.cleaned_data['message'] + "\n##### SENT BY: " + "No character but can send pings?" + " TO: " + form.cleaned_data['group'] + " WHEN: " + datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") + " #####\n##### Replies are NOT monitored #####\n"
group_to_send = form.cleaned_data['group']
broadcast_thread = xmppThread(1, "XMPP Broadcast Thread", 1, group_to_send, message_to_send)
broadcast_thread.start()
OpenfireManager.send_broadcast_threaded(group_to_send, message_to_send,)
success = True
else: