Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions tictactoe/apps/core/urls.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from django.conf.urls.defaults import patterns, include, url
from django.contrib.auth.decorators import login_required
import socketio.sdjango

from core.views import (game_list,
create_computer_game,
view_game,
create_move,
accept_invite,
socketio,
accept_invite
)

urlpatterns = patterns('core.views',
Expand Down Expand Up @@ -41,7 +42,7 @@
),
url(
regex=r'^socket\.io',
view=socketio
view=include(socketio.sdjango.urls)
),
)

Expand Down
14 changes: 3 additions & 11 deletions tictactoe/apps/core/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
from gevent.greenlet import Greenlet

from socketio.namespace import BaseNamespace
from socketio import socketio_manage
from socketio.sdjango import namespace

REDIS_HOST = getattr(settings, 'REDIS_HOST', 'localhost')

@namespace('/game')
class GameNamespace(BaseNamespace):
def listener(self, chan):
red = redis.StrictRedis(REDIS_HOST)
Expand All @@ -33,23 +34,14 @@ def listener(self, chan):

while True:
for i in red.listen():
self.send({'message': i}, json=True)
self.emit('message', i)

def recv_message(self, message):
action, pk = message.split(':')

if action == 'subscribe':
Greenlet.spawn(self.listener, pk)

def socketio(request):
socketio_manage(request.environ,
{
'': GameNamespace,
}, request=request
)

return HttpResponse()


@login_required
def create_move(request, game_id):
Expand Down
4 changes: 2 additions & 2 deletions tictactoe/pip_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ django-registration
gevent
redis
simplejson
-e git+git@github.com:sontek/gevent-socketio.git#egg=gevent_socketio
-e git+git@github.com:abourget/gevent-websocket.git#egg=gevent_websocket
-e git+git://github.com/abourget/gevent-socketio.git
-e git+git://github.com/abourget/gevent-websocket.git
8 changes: 4 additions & 4 deletions tictactoe/static/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ if ($("#notifications").text().trim() == "") {
$("#notifications").hide();
}

socket = io.connect();
socket = io.connect("/game");

socket.on("message", function(obj){
if (obj.message.type == "message") {
var data = eval(obj.message.data);

if (obj.type == "message") {
var data = eval(obj.data);
if (data[0] == "new_invite") {
SetNotificationMessage("You have a new game invite from " + data[1] + "<a href='" + data[2] + "'>Accept?</a>");
}
Expand Down