sergiotarxz/LasTres
1
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity

Fixing bug with redis.

Browse Source
This commit is contained in:
Sergiotarxz 2023-06-18 20:46:12 +02:00
parent c0acc2ee55
commit 370e6f536c
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/LasTres/Controller/Websocket.pm
View File

@ -14,7 +14,7 @@ use Data::Dumper;
use LasTres::Redis; use LasTres::Redis;
use LasTres::Controller::Websocket::InputPackets; use LasTres::Controller::Websocket::InputPackets;
my %sessions; our %SESSIONS;
use LasTres::DAO::PJs; use LasTres::DAO::PJs;
my $result_set_pjs = LasTres::DAO::PJs->ResultSet; my $result_set_pjs = LasTres::DAO::PJs->ResultSet;
@ -32,12 +32,12 @@ sub ws ($self) {
); );
} }
my $session_uuid = create_uuid_string; my $session_uuid = create_uuid_string;
$sessions{$session_uuid} = { $SESSIONS{$session_uuid} = {
user => $user, user => $user,
controller => $self, controller => $self,
uuid => $session_uuid, uuid => $session_uuid,
}; };
my $session = $sessions{$session_uuid}; my $session = $SESSIONS{$session_uuid};
$self->on( $self->on(
json => sub ( $self, $hash ) { json => sub ( $self, $hash ) {
$self->_handle_packet( $session, $hash ); $self->_handle_packet( $session, $hash );
@ -45,7 +45,12 @@ sub ws ($self) {
); );
$self->on( $self->on(
finish => sub ( $self, $code, $reason ) { finish => sub ( $self, $code, $reason ) {
delete $sessions{$session_uuid}; if (defined $session->{redis} && defined $session->{pj}) {
my $redis = $session->{redis};
my $pj = $session->{pj};
$redis->pubsub->unlisten($redis->pj_subscription($pj));
}
delete $SESSIONS{$session_uuid};
$reason ||= "No reason"; $reason ||= "No reason";
say STDERR say STDERR
"Websocket for user @{[$user->username]} closed with status $code and reason $reason."; "Websocket for user @{[$user->username]} closed with status $code and reason $reason.";

3
lib/LasTres/Controller/Websocket/InputPacket/Init.pm
View File

@ -14,7 +14,6 @@ use Moo;
use JSON qw/to_json from_json/; use JSON qw/to_json from_json/;
use LasTres::Flags; use LasTres::Flags;
use LasTres::Redis;
use LasTres::DAO::PJs; use LasTres::DAO::PJs;
with 'LasTres::Controller::Websocket::InputPacket'; with 'LasTres::Controller::Websocket::InputPacket';
@ -83,9 +82,7 @@ sub handle ( $self, $ws, $session, $data ) {
clear => $JSON::true, clear => $JSON::true,
); );
$info_packet_to_send->send($ws); $info_packet_to_send->send($ws);
require LasTres::Redis;
my $redis = LasTres::Redis->new; my $redis = LasTres::Redis->new;
say $redis->pj_subscription($pj);
$redis->subscribe($redis->pj_subscription($pj), my $save = sub($message, $topic, $topics) { $redis->subscribe($redis->pj_subscription($pj), my $save = sub($message, $topic, $topics) {
return $self->_on_redis_event($ws, $session, $message, $topic, $topics); return $self->_on_redis_event($ws, $session, $message, $topic, $topics);
}); });

2
lib/LasTres/Controller/Websocket/InputPacket/MoveBetweenLocations.pm
View File

@ -64,7 +64,7 @@ sub handle ( $self, $ws, $session, $data ) {
my $info_packet_to_send = my $info_packet_to_send =
LasTres::Controller::Websocket::OutputPacket::Info->new( LasTres::Controller::Websocket::OutputPacket::Info->new(
location_data => { location_data => {
current => $location->hash, current => $team->location->hash,
connected_places => $connected_places, connected_places => $connected_places,
}, },
); );