Changeset e8fd633 in rtems


Ignore:
Timestamp:
Jun 30, 2000, 12:38:25 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
e86236b
Parents:
068b6473
Message:

Patch from Chris Johns <cjohns@…> so the web server
shuts down on error -- not exitting the system.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/libnetworking/rtems_webserver/uemf.c

    r068b6473 re8fd633  
    3131void error(E_ARGS_DEC, int flags, char_t *fmt, ...)
    3232{
     33  va_list arglist;
     34 
     35  va_start(arglist, fmt);
     36 
    3337        if (flags & E_LOG) {
    3438                /* Log error message */
     
    4145
    4246        }
     47
     48  vprintf (fmt, arglist);
     49  va_end(arglist);
    4350}
    4451
  • c/src/libnetworking/rtems_webserver/webmain.c

    r068b6473 re8fd633  
    114114 *      Initialize the web server
    115115 */
    116         if (initWebs() < 0) {
    117           rtems_panic("Unable to initialize Web server !!\n");
     116        while (initWebs() < 0) {
     117                printf("\nUnable to initialize Web server !!\n"
     118                        " Suspending the task. Resume to try again.\n");
     119                rtems_task_suspend( RTEMS_SELF);
    118120        }
    119121
     
    138140#endif
    139141        bclose();
    140         rtems_task_delete( RTEMS_SELF );
     142        rtems_task_delete( RTEMS_SELF );
    141143}
    142144
  • cpukit/httpd/uemf.c

    r068b6473 re8fd633  
    3131void error(E_ARGS_DEC, int flags, char_t *fmt, ...)
    3232{
     33  va_list arglist;
     34 
     35  va_start(arglist, fmt);
     36 
    3337        if (flags & E_LOG) {
    3438                /* Log error message */
     
    4145
    4246        }
     47
     48  vprintf (fmt, arglist);
     49  va_end(arglist);
    4350}
    4451
  • cpukit/httpd/webmain.c

    r068b6473 re8fd633  
    114114 *      Initialize the web server
    115115 */
    116         if (initWebs() < 0) {
    117           rtems_panic("Unable to initialize Web server !!\n");
     116        while (initWebs() < 0) {
     117                printf("\nUnable to initialize Web server !!\n"
     118                        " Suspending the task. Resume to try again.\n");
     119                rtems_task_suspend( RTEMS_SELF);
    118120        }
    119121
     
    138140#endif
    139141        bclose();
    140         rtems_task_delete( RTEMS_SELF );
     142        rtems_task_delete( RTEMS_SELF );
    141143}
    142144
Note: See TracChangeset for help on using the changeset viewer.