[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Mon Dec 17 23:34:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-12-18 05:33:30 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

Modified files:
     eggdrop.complete.conf doc/html/mod-server.html
     doc/settings/mod.server modules/server/server.c
     modules/server/servmsg.c modules/server/help/set/server.help

Log message:

removed never-give-up as a config setting

---------------------- diff included ----------------------
Index: eggdrop1.7/doc/html/mod-server.html
diff -u eggdrop1.7/doc/html/mod-server.html:1.15 eggdrop1.7/doc/html/mod-server.html:1.16
--- eggdrop1.7/doc/html/mod-server.html:1.15	Sun Dec  9 15:49:40 2001
+++ eggdrop1.7/doc/html/mod-server.html	Mon Dec 17 23:33:19 2001
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: mod-server.html,v 1.15 2001/12/09 21:49:40 guppy Exp $ -->
+<!-- $Id: mod-server.html,v 1.16 2001/12/18 05:33:19 guppy Exp $ -->
 
 <html>
   <head>
@@ -151,16 +151,6 @@
           flooded with connects.</p>
 
           <p>Valid settings are 0-infinite</p>
-        </dd>
-
-        <dt><strong>set never-give-up 1</strong></dt>
-
-        <dd>
-          <p>This setting makes the bot cycle forever and keep trying to
-          connect to all irc servers in it&#39;s current list if they&#39;re
-          down.</p>
-
-          <p>Valid settings are 0 and 1.</p>
         </dd>
 
         <dt><strong>set server-timeout 60</strong></dt>
Index: eggdrop1.7/doc/settings/mod.server
diff -u eggdrop1.7/doc/settings/mod.server:1.14 eggdrop1.7/doc/settings/mod.server:1.15
--- eggdrop1.7/doc/settings/mod.server:1.14	Sun Dec  9 15:49:41 2001
+++ eggdrop1.7/doc/settings/mod.server	Mon Dec 17 23:33:19 2001
@@ -76,11 +76,6 @@
     since many ircops don't like being flooded with connects.
     Valid settings are 0-infinite
 
-set never-give-up 1
-    This settings makes the bot cycle forever and keep trying to connect to
-    all irc servers in it's current list if they're down.
-    Valid settings are 0 for OFF and 1 ON.
-
 
 set server-timeout 60
     Set here the timeout how long eggdrop should wait for a response when
Index: eggdrop1.7/eggdrop.complete.conf
diff -u eggdrop1.7/eggdrop.complete.conf:1.60 eggdrop1.7/eggdrop.complete.conf:1.61
--- eggdrop1.7/eggdrop.complete.conf:1.60	Sun Dec  9 21:22:27 2001
+++ eggdrop1.7/eggdrop.complete.conf	Mon Dec 17 23:33:19 2001
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- set that to the directory eggdrop is in i.e. "#! /home/lamest/egg/eggdrop"
 #
-# $Id: eggdrop.complete.conf,v 1.60 2001/12/10 03:22:27 guppy Exp $
+# $Id: eggdrop.complete.conf,v 1.61 2001/12/18 05:33:19 guppy Exp $
 #
 # This config file includes all possible options you can
 # use to configure your bot properly.
@@ -698,10 +698,6 @@
 set flood-msg 5:60
 # how many CTCPs in how many seconds?
 set flood-ctcp 3:60
-
-# [0/1] even if all the servers are down, cycle forever and keep trying to
-# connect?
-set never-give-up 1
 
 # [0/1] If this setting is 0 then the eggdrop keeps a seperate list of the names
 # irc servers call themselves, retaining what you entered in the config file.
Index: eggdrop1.7/modules/server/help/set/server.help
diff -u eggdrop1.7/modules/server/help/set/server.help:1.3 eggdrop1.7/modules/server/help/set/server.help:1.4
--- eggdrop1.7/modules/server/help/set/server.help:1.3	Sun Dec  9 15:49:41 2001
+++ eggdrop1.7/modules/server/help/set/server.help	Mon Dec 17 23:33:19 2001
@@ -36,14 +36,6 @@
    typically this is set off, since most sites are not running the
    ident protocol, and therefore may get ~ put in front of their
    username when their username is valid.
-%{help=set never-give-up}%{+n}
-###  %bset never-give-up%b <0/1>
-   specifies whether the bot should loop forever.  if never-give-up
-   is set false, then the bot will shut down if it goes through the
-   entire server list once without getting a connection.  this is to
-   keep eggdrop from going through an endless loop, if, for example,
-   your machine gets disconnected from the rest of the net.  however,
-   some people prefer their bot to never shut down, no matter what.
 %{help=set keep-nick}%{+n}
 ###  %bset keep-nick%b <0/1>
    specifies whether the bot will keep trying to regain its nickname if
@@ -159,10 +151,10 @@
    the server module, for a list of relevant commands type
    %b'.help server module'%b.
      %bserver-online%b        %bnet-type%b       %bnick%b
-     %bnever-give-up%b        %bflood-ctcp%b     %bserver%b
+     %bflood-ctcp%b           %bserver%b         %bcheck-stoned%b
      %bmax-queue-msg%b        %bstrict-host%b    %bbotnick%b
      %bserver-timeout%b       %bservers%b        %bkeep-nick%b
      %bstrict-servernames%b   %bbotname%b        %bquiet-reject%b
      %banswer-ctcp%b          %baltnick%b        %bflood-msg%b
      %btrigger-on-ignore%b    %bdefault-port%b   %brealname%b
-     %bserver-cycle-wait%b    %bcheck-stoned%b
+     %bserver-cycle-wait%b
Index: eggdrop1.7/modules/server/server.c
diff -u eggdrop1.7/modules/server/server.c:1.5 eggdrop1.7/modules/server/server.c:1.6
--- eggdrop1.7/modules/server/server.c:1.5	Sun Dec  9 21:22:29 2001
+++ eggdrop1.7/modules/server/server.c	Mon Dec 17 23:33:19 2001
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.5 2001/12/10 03:22:29 guppy Exp $
+ * $Id: server.c,v 1.6 2001/12/18 05:33:19 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -64,7 +64,6 @@
 					   re-beginning the server list */
 static char botrealname[121];	/* realname of bot */
 static int server_timeout;	/* server timeout for connecting */
-static int never_give_up;	/* never give up when connecting to servers? */
 static int strict_servernames;	/* don't update server list */
 static struct server_list *serverlist;	/* old-style queue, still used by
 					   server list */
@@ -1283,7 +1282,6 @@
 {
   {"server-timeout",		&server_timeout,		0},
   {"server-online",		(int *) &server_online,		2},
-  {"never-give-up",		&never_give_up,			0},
   {"keep-nick",			&keepnick,			0},
   {"strict-servernames",	&strict_servernames,		0},
   {"check-stoned",		&check_stoned,			0},
@@ -1755,7 +1753,6 @@
   server_cycle_wait = 60;
   strcpy(botrealname, "A deranged product of evil coders");
   server_timeout = 60;
-  never_give_up = 0;
   strict_servernames = 0;
   serverlist = NULL;
   cycle_time = 0;
Index: eggdrop1.7/modules/server/servmsg.c
diff -u eggdrop1.7/modules/server/servmsg.c:1.4 eggdrop1.7/modules/server/servmsg.c:1.5
--- eggdrop1.7/modules/server/servmsg.c:1.4	Sun Dec  9 20:50:55 2001
+++ eggdrop1.7/modules/server/servmsg.c	Mon Dec 17 23:33:19 2001
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.4 2001/12/10 02:50:55 guppy Exp $
+ * $Id: servmsg.c,v 1.5 2001/12/18 05:33:19 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1033,8 +1033,8 @@
   waiting_for_awake = 0;
   trying_server = now;
   empty_msgq();
-  /* Start up the counter (always reset it if "never-give-up" is on) */
-  if ((oldserv < 0) || (never_give_up))
+
+  if (oldserv < 0)
     oldserv = curserv;
   if (newserverport) {		/* Jump to specified server */
     curserv = (-1);		/* Reset server list */
@@ -1129,8 +1129,6 @@
     putlog(LOG_SERV, "*", "%s %s (%s)", _("Failed connect to"), dcc[servidx].host,
 	   s);
     lostdcc(servidx);
-    if (oldserv == curserv && !never_give_up)
-      fatal("NO SERVERS WILL ACCEPT MY CONNECTION.", 0);
   } else {
     dcc[servidx].sock = serv;
     /* Queue standard login */
----------------------- End of diff -----------------------



More information about the Changes mailing list