Changeset 23

Timestamp:

03/23/07 20:52:51 (2 years ago)

Author:

root

Message:

Registration caching to not flood flash clients with repited registered events. Changed debug level for digest_event_block and try to make some sense out of it

Files:

• trunk/op_server.pl (modified) (43 diffs)

trunk/op_server.pl

@@ -4662 +4662 @@
-            $texto        = "&unreachable,$tiempo";
-        }
+        elsif ( $state eq "Unregistered" ) {
+            $estado_final = "noregistrado";
+            $texto        = "&notregistered";
+        }
-        elsif ( $state eq "Lagged" ) {
-            $estado_final = "noregistrado";
@@ -5312 +5316 @@
-    $tab = $tab . "\t" if DEBUG;
-
-1
+25
-
-    @fake_bloque = ();
@@ -5335 +5339 @@
-        foreach my $mensaje (@mensajes) {
-            if ( defined($mensaje) && $mensaje ne "" ) {
-32
+256
-                delete $datos{""};    # Erase the hash with no uniqueid
-                ( $canal, $quehace, $dos, $uniqueid, $canalid ) = split( /\|/, $mensaje );
@@ -5345 +5349 @@
-
-                if ( $canal =~ /\/PSEUDO/ ) {
-32
+256
-                    next;
-                }
-
-                if ( $dos eq "skip" ) {
-32
+256
-                    next;
-                }
-
-                if ( $quehace eq "" ) {
-32
+256
-                    next;
-                }
-
-32
-32
-32
-32
-32
+256
+256
+256
+256
+256
-
-                $canalid =~ s/\s+//g;             # Removes whitespace from CHANNEL-ID
@@ -5378 +5382 @@
-                $server = $uniqueid;
-                $server =~ s/(.*)-(.*)/$2/g;
-
-                log_debug( "$heading Quehace $quehace", 64 ) if DEBUG;
-
-                my $buttontext = $dos;
@@ -5401 +5403 @@
-                        $toda .= "$key = $val\n"
-                          if ( $key ne "E" ) && ( defined($val) );
-128
+256
-                    }
-                    $toda .= " ";
@@ -5407 +5409 @@
-
-                    if ( $quehace eq "corto" ) {
+                        log_debug( "$heading erasing datos{$uniqueid}", 256 ) if DEBUG;
-                        delete $datos{$uniqueid};
+
+                        if ( $cuantos == 0 ) {
+
+                            # We need to call it here because a channel with no buttons defined
+                            # might count for other button that exists, like meetmes, queues, etc.
+                            # So we only call it when there is NO match for buttons (because
+                            # we will call it again for existing matches)
+                            erase_all_sessions_from_channel( $canalid, $canal, $server );
+                        }
-                    }
-
-                    log_debug( "$heading erasing datos{$uniqueid}", 128 ) if DEBUG;
-
-                    if ( $cuantos == 0 ) {
-
-                        # We delete all appeareance in sesbot because the channel without
-                        # a button might occupy one slot in sesbot. If we have a button
-                        # match then skip this step for later
-                        erase_all_sessions_from_channel( $canalid, $canal, $server );
-                    }
-
-                }
-                elsif ( $quehace eq "queueremoved" ) {
@@ -5452 +5453 @@
-
-                foreach $canal (@canaleja) {
-32
-32
+256
+256
-
-                    if ( $dosoriginal ne "" ) {
@@ -5465 +5466 @@
-
-                    if ( !defined( $buttons{"$server^$canal"} ) && !defined( $buttons{"-1^$canal"} ) ) {
-128
+256
-                        if (DEBUG) {
-                            for ( keys %buttons ) {
-128
+256
-                            }
-                        }
@@ -5477 +5478 @@
-                    # except ocupado*, corto, setlink and unsetlink
-                    if ( $canal =~ /^_/ ) {
-32
+256
-
-                        if (   $quehace =~ /registr/
@@ -5483 +5484 @@
-                            || $quehace =~ /^inf/ )
-                        {
-32
+256
-                            next;
-                        }
@@ -5509 +5510 @@
-                            my ( $canalsolo, $nrotrunk ) = split( /=/, $canal );
-                            $canal = $canalsolo . "=1" . $elcontexto;
-32
+256
-
-                            #next;
-                        }
-
-wildcard
+regexp
-                        # and change led_color (the 1 after changelabel)
-                        # change it so to not change the led color.
-                        if ( $quehace =~ /changelabel1/ ) {
-el regexp tiene changelabel1, lo cambio por changelabel0!", 32
+regexp has changelabel1, lets change it to changelabel0!", 256
-                              if DEBUG;
-                            $quehace = "changelabel0";
@@ -5529 +5530 @@
-
-                        # No channel? continue...
-32
+256
-
-                    }
@@ -5569 +5570 @@
-                                    $btnorinum = $buttons{"$serverindex^$canaleje"};
-                                }
-32
+256
-                                my $listabotones = generate_linked_buttons_list( $canaleje, $server );
-                                push @respuestas, "$btnorinum|linked|$listabotones";
@@ -5575 +5576 @@
-
-                            delete $datos{$uniqueid};
-32
+256
-
-                        }
-                        elsif ( $quehace eq "setlink" ) {
-
-32
+256
-                            my ( $nada1, $contexto1 ) = split( /\&/, $canal );
-                            if ( !defined($contexto1) ) { $contexto1 = ""; }
@@ -5588 +5589 @@
-                                push @{ $linkbot{"$server^$canal"} }, "";
-                                pop @{ $linkbot{"$server^$canal"} };
-32
+256
-                            }
-
@@ -5598 +5599 @@
-                                if ( $contexto1 eq $contexto2 ) {
-                                    push @{ $linkbot{"$server^$canal"} }, $dos;
-32
+256
-                                      if DEBUG;
-                                }
@@ -5607 +5608 @@
-
-                            foreach my $valorad (@uniq) {
-32
+256
-                            }
-                            my $btnorinum = $buttons{"$serverindex^$canal"};
-32
+256
-                            $listabotones = generate_linked_buttons_list( $canal, $server );
-                            push @respuestas, "$btnorinum|linked|$listabotones";
-                            $botonlinked{$btnorinum} = $listabotones;
-32
-32
+256
+256
-
-                        }
-                        elsif ( $quehace eq "unsetlink" ) {
-32
+256
-                            my @final = ();
-                            foreach my $msesion ( @{ $linkbot{"$server^$canal"} } ) {
@@ -5627 +5628 @@
-                            }
-                            $linkbot{"$server^$canal"} = [@final];
-32
+256
-
-                        }
@@ -5648 +5649 @@
-                        # Continue after cleaning internal state...
-                        if ( $interno eq "" ) {
-32
+256
-                            next;
-                        }
-                        else {
-32
+256
-                        }
-
@@ -5675 +5676 @@
-                        #
-                        if ( $canalid eq "" || $canalid =~ /zombie/i || $canalid =~ /(.*)-XXXX$/ ) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                        else {
@@ -5681 +5694 @@
-                            if ( $quehace eq "corto" ) {
-
-32
+256
-
-                                delete $botonpark{$interno};
@@ -5708 +5721 @@
-                                if ( $cuantos == 0 ) {
-                                    log_debug( "$heading CORTO y SE DESOCUPO estadoboton($interno) = free, sesbot($interno) esta vacio",
-32
+256
-                                      if DEBUG;
-                                    $cambiaron{$interno}   = 1;
@@ -5715 +5728 @@
-                                else {
-                                    log_debug( "$heading CORTO y SIGUE OCUPADO estadoboton($interno) = busy, sesbot($interno) tiene algo",
-32
+256
-                                      if DEBUG;
-                                    &print_sesbot(3);
@@ -5728 +5741 @@
-
-                                        log_debug(
-32
+256
-                                          if DEBUG;
-                                    }
@@ -5749 +5762 @@
-
-                                # quehace no es "corto"
-                                #
-
-                                # MAINTAINS SESBOT HASH
@@ -5762 +5774 @@
-                                    push @{ $sesbot{$interno} }, "$canalid";
-
-32
+256
-
-                                    my @uniq = unique( @{ $sesbot{$interno} } );
@@ -5768 +5780 @@
-
-                                    foreach my $vavi ( @{ $sesbot{$interno} } ) {
-32
-32
+256
+256
-                                    }
-                                }
-
-                                if ( $canal =~ /^_/ && $quehace =~ /^ring/ ) {
-TENGO UN WILDCARD ORIGINANDO LLAMADO! $canal $quehace $canalid", 32
+have a regexp originating a call $canal $quehace $canalid, rename label", 256
-                                      if DEBUG;
-
-
-
-
+
-                                    if ( $ren_wildcard == 1 ) {
-                                        push @respuestas, "$interno|changelabel0|$canalid";
@@ -5833 +5842 @@
-                        }
-
-32
+256
-
-                        if ( $quehace =~ /changelabel/ ) {
-32
+256
-
-                            # Mantains state of label and led
@@ -5878 +5887 @@
-                        elsif ( $quehace eq "park" ) {
-
-32
+256
-                            $dos =~ m/(.*)\((.*)\)/;
-                            my $texto   = $1;
@@ -5983 +5992 @@
-                            && ( $quehace !~ /link/ ) )
-                        {
-
-
+
+
+
+
-                        }
-
@@ -5993 +6004 @@
-
-                        if ( @{ $sesbot{$interno} } > 0 && $quehace eq 'corto' ) {
-32
+256
-                              if DEBUG;
-                        }
@@ -6006 +6017 @@
-                            my $quehace2 = $quehace;
-
-                            if ( $quehace2 eq "ring" ) {
-
-                                #$quehace2 = "ocupado";
-                            }
-
-                            next unless ( $quehace2 ne "setlink" );
-                            next unless ( $quehace2 ne "unsetlink" );
-
-32
+256
-
-                            if ( $quehace2 eq "isagent" && $dos == -1 ) {
-32
+256
-                                push @mensajefinal, "$interno|changelabel1|original";
-                                push @mensajefinal, "$interno|settimer|0\@STOP";
@@ -6027 +6033 @@
-
-                                # clear the agent helper hashes. We do it here because we first need to map
-32
+256
-                                my $canalag = $canalid;
-                                $canalag = substr( $canalag, 0, -5 );
@@ -6038 +6044 @@
-                                    if ( $val eq $canalag ) {
-                                        delete $channel_to_agent{$key};
-64
+256
-                                    }
-                                }
@@ -6045 +6051 @@
-                                if ( defined( $agent_to_channel{"$server^$canalag"} ) ) {
-                                    delete $agent_to_channel{"$server^$canalag"};
-64
+256
-                                }
-
@@ -6060 +6066 @@
-
-                            if ( $quehace2 !~ /isagent/ && $quehace2 !~ /^agentlogoff/ && $quehace2 !~ /^setclid/ ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                    }
-                                }
@@ -6115 +6123 @@
-                            }
-                            if ( $quehace2 =~ /corto/ ) {
-32
+256
-
-                                my $canalsincontexto = $canal;
@@ -6139 +6147 @@
-                                        $iniagent = $channel_to_agent{"$server^$canalsincontexto"};
-                                    }
-32
+256
-                                    $botontimer{$interno}     = time();
-                                    $botontimertype{$interno} = "IDLE";
@@ -6152 +6160 @@
-                                else {
-                                    my $valip = "";
-32
+256
-
-                                    push @mensajefinal, "$interno|settimer|0\@STOP";
@@ -6197 +6205 @@
-                                $boton_paused{$interno} = $dos;
-                            }
-
+els
-                                $boton_agentpaused{$interno} = $dos;
-                            }
-
+els
-                                $boton_agentready{$interno} = $dos;
-                            }
-
+els
-                                $boton_agentbusy{$interno} = $dos;
-                            }
-
+els
-                                $boton_agentlogedof{$interno} = $dos;
-                            }
-
-32
+256
-
-                            #if (defined($mensajefinal) && $interno ne "")
@@ -6217 +6225 @@
-                                if ( exists $cambiaron{$interno} ) {
-
-32
+256
-                                      if DEBUG;
-
-
-
-
+
+
+
+
+
-                                    }
-                                }
-                                else {
-
-
-
-
-
-
-
+
-                                }
-                                if ( $toda ne "" ) {
@@ -6251 +6255 @@
-    @respuestas = unique(@respuestas);
-    $cuantas    = $#respuestas + 1;
-1
+25
-    foreach my $valor (@respuestas) {
-32
+256
-    }
-    $tab = substr( $tab, 0, -1 ) if DEBUG;