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.72 by root, Sun Oct 1 11:41:37 2006 UTC vs.
Revision 1.74 by root, Sun Oct 1 15:59:29 2006 UTC

… …
1029} 1029}
1030 1030
1031############################################################################# 1031#############################################################################
1032# the server's main() 1032# the server's main()
1033 1033
1034sub load_cfg { 1034sub cfg_load {
1035 open my $fh, "<:utf8", cf::confdir . "/config" 1035 open my $fh, "<:utf8", cf::confdir . "/config"
1036 or return; 1036 or return;
1037 1037
1038 local $/; 1038 local $/;
1039 *CFG = YAML::Syck::Load <$fh>; 1039 *CFG = YAML::Syck::Load <$fh>;
1040
1041 use Data::Dumper; warn Dumper \%CFG;
1042} 1040}
1043 1041
1044sub main { 1042sub main {
1045 load_cfg; 1043 cfg_load;
1046 db_load; 1044 db_load;
1047 load_extensions; 1045 load_extensions;
1048 Event::loop; 1046 Event::loop;
1049} 1047}
1050 1048
… …
1102 1100
1103 # reload cf.pm 1101 # reload cf.pm
1104 $msg->("reloading cf.pm"); 1102 $msg->("reloading cf.pm");
1105 require cf; 1103 require cf;
1106 1104
1107 # load database again 1105 # load config and database again
1106 cf::cfg_load;
1108 cf::db_load; 1107 cf::db_load;
1109 1108
1110 # load extensions 1109 # load extensions
1111 $msg->("load extensions"); 1110 $msg->("load extensions");
1112 cf::load_extensions; 1111 cf::load_extensions;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines