-

Alain Prouté
1 parent fa1d90f6
Showing 3 changed files with 41 additions and 21 deletions Show diff stats
anubis_dev/library/examples/network/sokoban.anubis
anubis_dev/library/mail/smtp_server.anubis
anubis_dev/library/tools/adm_autoreload.anubis
@@ -1336,7 +1336,7 @@ define HTML_Page
     (
       List(Web_arg) lwa
     ) =
-   print("length web args: "+length(lwa)+"\n"); 
+   //print("length web args: "+length(lwa)+"\n"); 
    map_forget((Web_arg wa) |-> if wa is 
                   {
                       web_arg(name,value) then print("["+name+"="+value+"]\n"), 
@@ -1345,15 +1345,16 @@ define HTML_Page
   with numlevel = length(all_murase_grids), 
   with level = if web_arg_value(lwa,"level") is 
     {
-      not_found then print("level not found\n"); 0, 
-      found(v) then print("level arg = "+v+"\n"); 
+      not_found then //print("level not found\n"); 
+                     0, 
+      found(v) then //print("level arg = "+v+"\n"); 
                     if decimal_scan(v) is 
         {
           failure then 0, 
           success(n) then n
         }
     }, 
-   print(">>>> level = "+level+"\n"); 
+   //print(">>>> level = "+level+"\n"); 
   html_page("Sokoban",[],
     body([],
       center(table([],[
@@ -21,10 +21,10 @@ public type SMTP_ServerDescription:
      (
        Word32       ip_address,           // 0 is OK, meaning listen on all interfaces
        Word32       ip_port,              // Official value is 25
-       String      server_common_name,   // for example "mail.our-business.com"
-                                         //          or "smtp.our-business.com"
-       String      server_directory,     // where the SMTP server stores its data (and mail)
-       Int         max_mail_size         // maximal size (bytes) of mail the server will accept
+       String       server_common_name,   // for example "mail.our-business.com"
+                                          //          or "smtp.our-business.com"
+       String       server_directory,     // where the SMTP server stores its data (and mail)
+       Int          max_mail_size         // maximal size (bytes) of mail the server will accept
      ). 
  
  
@@ -37,7 +37,17 @@ public define One
        SMTP_ServerDescription description
      ). 
  
-
+   or by: 
+   
+public define One
+   start_smtp_server
+     (
+       SMTP_ServerDescription description, 
+       Var(Bool)              shutdown
+     ). 
+   
+   if you want to shutdown the server by putting the value 'true' into the boolean variable. 
+   
  
    If  you are  impatient  to  test it,  just  create a  directory  for  your SMTP  server
    ('/home/georges/smtp_server' in our example), customize the following function, compile
@@ -947,13 +957,15 @@ define One
 public define One
    start_smtp_server
      (
-       SMTP_ServerDescription desc
+       SMTP_ServerDescription desc,
+       Var(Bool)              shutdown
      ) =
    create_directories(desc);
    if start_server(ip_address(desc),
                    ip_port(desc), 
                    smtp_handler(desc),
-                   (One u) |-> unique) is 
+                   (One u) |-> unique,
+                   shutdown) is 
      {
        cannot_create_the_socket then print("Cannot create the listening socket.\n"), 
        cannot_bind_to_port      then print("Cannot bind to port "+ip_port(desc)+".\n"), 
@@ -963,7 +975,14 @@ public define One
                   ":"+to_decimal(ip_port(desc))+".\n")
      }. 
  
+public define One
+   start_smtp_server
+     (
+       SMTP_ServerDescription desc
+     ) =
+   start_smtp_server(desc,var(false)). 
  
+      
  
 global define One
    smtp_server
@@ -147,7 +147,7 @@ public define One
  
    The command 'start_adm_loader_bubu' creates and starts the adm loader named 
    'bubu'. The reason why the adm loader must have a name is that you can launch
-   several adm loaders (which have distinct types).  
+   several adm loaders (which also have distinct types).  
  
    In general, you call the above function only once. The variable 'shutdown_loader'
    must contain 'false'. The adm loader (which is running in the backgound)
@@ -163,7 +163,7 @@ public define One
    the module contains a server, to shutdown the previous 
    version if there was one. The function 'start...' can start the new server. 
    The functions 'stop_...' are also used when the adm loader 
-   itself is shutdown, i.e. when the variable 'shutdown_required' receives the value 
+   itself is shutdown, i.e. when the variable 'shutdown_loader' receives the value 
    'true'. In case of a family of modules, the 'stop_...' function is applied to all
    the modules of the familly which are currently loaded. 
  
@@ -305,8 +305,8 @@ public define One
  
    Now, consider that we have an actual, fully justified, secondary module. If it is 
    a specialized module, just load it from the module using it. On the contrary, if it 
-   is a general purpose module, you may want to load it when your program start and to
-   transmit its content to any modules to be loaded next. 
+   is a general purpose module, you may want to load it when your program starts and to
+   transmit its content to some modules to be loaded next. 
  
    However, there is a problem, because if you have two general purpose modules, it may be
    the case that one of them requires the content of the other one. You cannot load them
@@ -325,7 +325,7 @@ public define One
    of mod1 to mod2 when this start function is executed (by the second loader). 
  
    All this needs a lot of organization, and we plan to propose a program for automating
-   it in the future. 
+   (at least partially) it in the future. 
  
  
  
@@ -506,7 +506,7 @@ define String
        "                                     start_"+n+",\n"+
        "                                     stop_"+n+",\n"+
        "                                     "+n+"_v),\n"+
-       "                            shutdown_required,\n"+
+       "                            shutdown_loader,\n"+
        "                            warn,\n"+
        "                            "+to_decimal(delay)+"),\n"+
        make_delegates(t)
@@ -549,7 +549,7 @@ public define One
        print(target,
  
        "\n\n   This file was automatically generated.\n"+
-       "   See 'library/tools/adm_autoreload.anubis' for more explanations.\n\n"+
+       "   See 'library/tools/adm_autoreload.anubis' for explanations.\n\n"+
  
        "read tools/basis.anubis\n"+
        "read tools/ISO-8601.anubis\n"+
@@ -558,13 +558,13 @@ public define One
  
        "public type AdmLoader_"+loader_name+":...   (an opaque type)\n\n"+
        "   'start_adm_loader_"+loader_name+"' creates and starts your adm loader.\n"+
-       "   The dynamic variable 'shutdown_required' must contain 'false'.\n"+
+       "   The dynamic variable 'shutdown_loader' must contain 'false'.\n"+
        "   The adm loader will shutdown as soon as this variable receives\n"+
        "   the value 'true'.\n\n"+
  
        "public define AdmLoader_"+loader_name+"    start_adm_loader_"+loader_name+"\n"+
        "   (\n"+
-       "     Var(Bool)                                           shutdown_required,\n"+
+       "     Var(Bool)                                           shutdown_loader,\n"+
        "     String -> One                                       warn,\n"+
        concat(map(make_start_stop_decl,l),",\n")+
        "\n   ).\n\n"+ 
@@ -607,7 +607,7 @@ public define One
  
        "public define AdmLoader_"+loader_name+"    start_adm_loader_"+loader_name+"\n"+
        "   (\n"+
-       "     Var(Bool)                                           shutdown_required,\n"+
+       "     Var(Bool)                                           shutdown_loader,\n"+
        "     String -> One                                       warn,\n"+
        concat(map(make_start_stop_decl,l),",\n")+
        "\n   ) =\n"+