ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.62 by root, Fri Sep 8 16:51:44 2006 UTC vs.
Revision 1.64 by root, Sun Sep 10 00:51:24 2006 UTC

11use Event; 11use Event;
12$Event::Eval = 1; # no idea why this is required, but it is 12$Event::Eval = 1; # no idea why this is required, but it is
13 13
14use strict; 14use strict;
15 15
16_reload_1; 16_init_vars;
17 17
18our %COMMAND = (); 18our %COMMAND = ();
19our @EVENT; 19our @EVENT;
20our $LIBDIR = maps_directory "perl"; 20our $LIBDIR = maps_directory "perl";
21 21
353 for (@$callbacks) { 353 for (@$callbacks) {
354 eval { &{$_->[1]} }; 354 eval { &{$_->[1]} };
355 355
356 if ($@) { 356 if ($@) {
357 warn "$@"; 357 warn "$@";
358 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n"; 358 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
359 override; 359 override;
360 } 360 }
361 361
362 return 1 if $override; 362 return 1 if $override;
363 } 363 }
695 $msg->("reloading cf.pm"); 695 $msg->("reloading cf.pm");
696 require cf; 696 require cf;
697 697
698 $msg->("load extensions"); 698 $msg->("load extensions");
699 cf::load_extensions; 699 cf::load_extensions;
700
701 $msg->("reattach");
702 _global_reattach;
700 }; 703 };
701 $msg->($@) if $@; 704 $msg->($@) if $@;
702 705
703 $msg->("reloaded"); 706 $msg->("reloaded");
704}; 707};
923 $TICK_WATCHER->at ($NEXT_TICK); 926 $TICK_WATCHER->at ($NEXT_TICK);
924 $TICK_WATCHER->start; 927 $TICK_WATCHER->start;
925 }, 928 },
926); 929);
927 930
928_reload_2;
929
9301 9311
931 932

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines