[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
Date: |
Sun, 12 Nov 2006 12:36:15 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/11/12 12:36:14
Modified files:
distrib : ChangeLog
src/daemon/common: commonComplexOptions.ml commonGlobals.ml
src/daemon/driver: driverInterface.ml driverMain.ml
src/networks/donkey: donkeyClient.ml donkeyGlobals.ml
src/networks/opennap: opennapClients.ml
src/utils/net : ip_set.ml
Log message:
patch #5543
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1081&r2=1.1082
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonComplexOptions.ml?cvsroot=mldonkey&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonGlobals.ml?cvsroot=mldonkey&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInterface.ml?cvsroot=mldonkey&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.129&r2=1.130
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyClient.ml?cvsroot=mldonkey&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/opennap/opennapClients.ml?cvsroot=mldonkey&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/ip_set.ml?cvsroot=mldonkey&r1=1.29&r2=1.30
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1081
retrieving revision 1.1082
diff -u -b -r1.1081 -r1.1082
--- distrib/ChangeLog 12 Nov 2006 12:34:50 -0000 1.1081
+++ distrib/ChangeLog 12 Nov 2006 12:36:14 -0000 1.1082
@@ -15,6 +15,7 @@
=========
2006/11/12
+5543: Improve exception handling, fix some indentions (pango)
5542: CommonSources: Work-around division-by-zero bug in Ocaml
on Alpha platform (pango)
Index: src/daemon/common/commonComplexOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- src/daemon/common/commonComplexOptions.ml 9 Nov 2006 21:32:25 -0000
1.65
+++ src/daemon/common/commonComplexOptions.ml 12 Nov 2006 12:36:14 -0000
1.66
@@ -1149,19 +1149,15 @@
Pervasives.really_input ic s 0 size;
header, s) in
Tar.output otar header s
- with e ->
- let error = Printexc2.to_string e in
- if error = "Gzip.Error(\"error during compression\")"
- && Autoconf.windows && arg = "fasttrack.ini" then begin
+ with
+ | (Gzip.Error "error during compression") as e when Autoconf.windows &&
arg = "fasttrack.ini" ->
(* for whatever reason this error is raised on Windows,
but fasttrack.ini is stored correctly *)
if !verbose then
- lprintf_nl "Tar: Windows specific pseudo error %s in %s" error arg
- end
- else begin
+ lprintf_nl "Tar: Windows specific pseudo error %s in %s"
(Printexc2.to_string e) arg
+ | e ->
failed_files := arg :: !failed_files;
- lprintf_nl "Tar: error %s in %s" error arg
- end
+ lprintf_nl "Tar: error %s in %s" (Printexc2.to_string e) arg
) files);
if !failed_files <> [] then
failwith (Printf.sprintf "Tar: error backing up %s"
Index: src/daemon/common/commonGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonGlobals.ml,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- src/daemon/common/commonGlobals.ml 9 Nov 2006 21:32:26 -0000 1.73
+++ src/daemon/common/commonGlobals.ml 12 Nov 2006 12:36:14 -0000 1.74
@@ -481,17 +481,18 @@
let log_chat_message i num n s =
Fifo.put chat_message_fifo (last_time(),i,num,n,s);
- try
+ (try
Unix2.tryopen_write_gen !messages_log [Open_creat; Open_wronly;
Open_append]
0o600 (fun oc ->
Printf.fprintf oc "%s: %s (%s): %s\n" (Date.simple
(BasicSocket.date_of_int (last_time ()))) n i s)
with e ->
lprintf_nl "[ERROR] Exception %s while trying to log message to %s"
- (Printexc2.to_string e) !messages_log;
+ (Printexc2.to_string e) !messages_log);
while (Fifo.length chat_message_fifo) > !!html_mods_max_messages do
ignore(Fifo.take chat_message_fifo)
done
+
let last_message_log = ref 0
Index: src/daemon/driver/driverInterface.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInterface.ml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- src/daemon/driver/driverInterface.ml 9 Nov 2006 21:32:26 -0000
1.56
+++ src/daemon/driver/driverInterface.ml 12 Nov 2006 12:36:14 -0000
1.57
@@ -1097,17 +1097,15 @@
server_set_preferred s preferred
with
- Failure s ->
+ | Failure s ->
gui_send gui (Console (Printf.sprintf "Failure: %s\n" s))
- | e ->
- match Printexc2.to_string e with
- "BTInteractive.Torrent_can_not_be_used" ->
+ | BTInteractive.Torrent_can_not_be_used ->
gui_send gui (Console (Printf.sprintf "\nError: This torrent does not
have valid tracker URLs\n"))
- | "BTInteractive.Already_exists" ->
+ | BTInteractive.Already_exists ->
gui_send gui (Console (Printf.sprintf "\nError: This torrent is
already in download queue\n"))
| e ->
gui_send gui (Console (Printf.sprintf "from_gui: exception %s for
message %s\n"
- e (GuiProto.string_of_from_gui t)))
+ (Printexc2.to_string e) (GuiProto.string_of_from_gui t)))
let gui_events () =
{
Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- src/daemon/driver/driverMain.ml 25 Oct 2006 11:34:46 -0000 1.129
+++ src/daemon/driver/driverMain.ml 12 Nov 2006 12:36:14 -0000 1.130
@@ -102,7 +102,8 @@
| Some dir -> allowed_ips =:= !!allowed_ips
);
- if !!http_port <> 0 then begin try
+ if !!http_port <> 0 then begin
+ try
ignore (DriverControlers.create_http_handler ());
with e ->
lprintf_nl (_b "Exception %s while starting HTTP interface")
Index: src/networks/donkey/donkeyClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- src/networks/donkey/donkeyClient.ml 31 Oct 2006 15:40:05 -0000 1.105
+++ src/networks/donkey/donkeyClient.ml 12 Nov 2006 12:36:14 -0000 1.106
@@ -2653,7 +2653,7 @@
(CommonClient.as_client c.client_client);
with
- Not_found -> ()
+ | Not_found -> ()
| e ->
if !verbose then
lprintf_nl "add_location: exception %s" (Printexc2.to_string e)
@@ -2668,7 +2668,7 @@
(CommonClient.as_client c.client_client);
with
- Not_found -> ()
+ | Not_found -> ()
| e ->
if !verbose then
lprintf_nl "remove_location for file_md4 %s: exception %s"
Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
Index: src/networks/opennap/opennapClients.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/opennap/opennapClients.ml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/networks/opennap/opennapClients.ml 10 Apr 2006 19:16:36 -0000
1.10
+++ src/networks/opennap/opennapClients.ml 12 Nov 2006 12:36:14 -0000
1.11
@@ -69,8 +69,8 @@
(try file_completed (as_file file.file_file)
with e ->
lprintf "Exception %s in file completed"
- (Printexc2.to_string e)
- ; lprint_newline ());
+ (Printexc2.to_string e);
+ lprint_newline ());
current_files := List2.removeq file !current_files;
old_files =:= (file.file_name, file_size file) :: !!old_files;
List.iter (fun c ->
Index: src/utils/net/ip_set.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/ip_set.ml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/05
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/05
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/13
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/13
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/15
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/19
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/11/19