Changeset 3322

Show
Ignore:
Timestamp:
12/29/09 13:10:08 (10 years ago)
Author:
zackrb
Message:

Changed the functionality of the stop_seattle script in the following way: the python program that kills all seattle process no longer has to run forever in the background now that the crontab entry for all seattle nodes has been updated to start seattle only on machine boot rather than every minute. Removed the seattlestopper_lock, added a new stop_all_seattle_processes.py file, amended make_base_installers.py, and modified start_seattle and stop_seattle scripts. See ticket #659

Location:
seattle/trunk
Files:
2 added
2 removed
15 modified
1 moved

Legend:

Unmodified
Added
Removed
  • seattle/trunk/dist/final_files.fi

    r3310 r3322  
    8787req tracebackrepy.py 
    8888req registerhttpcallback.repy 
    89 req impose_seattlestopper_lock.py 
    9089req createnodekeys.py 
    9190req runonce.py 
    9291req writemetainfo.py 
    9392req parallelize.repy 
    94 req get_seattlestopper_lock.py 
    9593req windows_api.py 
    9694req win_cpu_nanny.py 
     
    144142req safe_eval.repy 
    145143req strace.py 
     144req stop_all_seattle_processes.py 
    146145 
    147146# Files added during install build: 
  • seattle/trunk/dist/initial_files.fi

    r3310 r3322  
    8686req tracebackrepy.py 
    8787req registerhttpcallback.repy 
    88 req impose_seattlestopper_lock.py 
    8988req createnodekeys.py 
    9089req runonce.py 
    9190req writemetainfo.py 
    9291req parallelize.repy 
    93 req get_seattlestopper_lock.py 
    9492req windows_api.py 
    9593req win_cpu_nanny.py 
     
    143141req safe_eval.repy 
    144142req strace.py 
     143req stop_all_seattle_processes.py 
  • seattle/trunk/dist/linux/scripts/manifest.txt

    r3221 r3322  
    2020 
    2121==start_seattle.sh== 
    22 Included in the Linux installer, it starts the scripts that comprise 
    23 seattle in the background when run. 
     22Included in the Linux installer, it starts the seattle programs which run in the 
     23background. 
    2424 
    2525==stop_seattle.sh= 
    26 Included in the Linux installer, it runs impose_seattlestopper_lock.py in the 
    27 background when called. 
     26Included in the Linux installer, it kills all seattle processes by running 
     27stop_all_seattle_processes.py 
    2828 
    2929==seattleuninstaller.py== 
  • seattle/trunk/dist/linux/scripts/start_seattle.sh

    r3206 r3322  
    66 
    77 
    8 python get_seattlestopper_lock.py 
    98python nmmain.py & 
    109python softwareupdater.py & 
  • seattle/trunk/dist/linux/scripts/stop_seattle.sh

    r2816 r3322  
    33cd "`echo $0 | sed 's/stop_seattle.sh//'`" 
    44 
    5 python impose_seattlestopper_lock.py& 
     5python stop_all_seattle_processes.py 
    66echo "seattle has been stopped." 
  • seattle/trunk/dist/mac/scripts/manifest.txt

    r3221 r3322  
    2121 
    2222==start_seattle.sh== 
    23 Included in the Mac installer, it starts the scripts that comprise 
    24 seattle in the background when called. 
     23Included in the Mac installer, it starts the seattle programs which run in the 
     24background. 
    2525 
    2626==stop_seattle.sh== 
    27 Included in the Mac installer, it starts impose_seattlestopper_lock.py in the 
    28 background when called. 
     27Included in the Mac installer, it kills all seattle processes by running 
     28stop_all_seattle_processes.py 
    2929 
    3030==seattleuninstaller.py== 
  • seattle/trunk/dist/mac/scripts/start_seattle.sh

    r3206 r3322  
    66 
    77 
    8 python get_seattlestopper_lock.py 
    98python nmmain.py & 
    109python softwareupdater.py & 
  • seattle/trunk/dist/mac/scripts/stop_seattle.sh

    r2816 r3322  
    33cd "`echo $0 | sed 's/stop_seattle.sh//'`" 
    44 
    5 python impose_seattlestopper_lock.py& 
     5python stop_all_seattle_processes.py 
    66echo "seattle has been stopped." 
  • seattle/trunk/dist/make_base_installers.py

    r3259 r3322  
    224224  shutil.copy2(trunk_location + "/dist/seattleuninstaller.py", temp_install_dir) 
    225225 
     226  # Copy the script that stops all running seattle processes. 
     227  shutil.copy2(trunk_location + "/dist/stop_all_seattle_processes.py", 
     228               temp_install_dir) 
     229 
    226230  # Copy the script that will update old crontab entries on Linux and Darwin 
    227231  # systems to the new 2009 seattle crontab entry.  This must remain in the 
  • seattle/trunk/dist/seattleuninstaller.py

    r3259 r3322  
    3535import persist 
    3636import nonportable 
    37 import impose_seattlestopper_lock 
     37import stop_all_seattle_processes 
    3838import servicelogger 
    3939# import the installer to easily use some of it's functionality (e.g., get the 
     
    268268    Removes seattle from the Winodws registry startup key and/or the 
    269269    startup folder should either exist, then stops all seattle processes using 
    270     impose_seattlestopper_lock.py. 
     270    stop_all_seattle_process.py 
    271271 
    272272  <Arguments> 
     
    326326  elif removed_from_registry or removed_from_startup_folder: 
    327327    # Stop all instances of seattle from running before returning. 
    328     impose_seattlestopper_lock.killall() 
     328    stop_all_seattle_processes.main() 
    329329    return True 
    330330 
     
    336336  <Purpose> 
    337337    Remove the seattle entry from the crontab, and kill all seattle processes 
    338     by using impose_seattlestopper_lock. 
     338    by using stop_all_seattle_processes.py 
    339339 
    340340  <Arguments> 
     
    401401  else: 
    402402    # Stop all instances of seattle from running before returning. 
    403     impose_seattlestopper_lock.killall() 
     403    stop_all_seattle_processes.main() 
    404404 
    405405    configuration = persist.restore_object("nodeman.cfg") 
  • seattle/trunk/dist/tests/startstop_test.py

    r2357 r3322  
    1111<Purpose> 
    1212  Prints out the processes holding the keys: "seattlenodemanager", 
    13   "softwareupdater.old", "softwareupdater.new", and "seattlestopper". Created to 
    14   be inserted into the start_seattle and stop_seattle scripts, both before and 
    15   after the original programs in those scripts, to confirm what programs are 
    16   holding the the locks before and after the scripts are run. 
    17 """ 
     13  "softwareupdater.old", "softwareupdater.new". 
     14 
     15  Designed to be run before and after the start_seattle and stop_seattle scripts 
     16  in order to confirm that the node manager and software updater were indeed 
     17  started or stopped by the corresponding start_seattle and stop_seattle script. 
     18 """ 
    1819 
    1920import runonce 
     
    2223 
    2324 
    24 locklist = ["seattlenodemanager", "softwareupdater.old", "softwareupdater.new",\ 
    25             "seattlestopper"] 
     25locklist = ["seattlenodemanager", "softwareupdater.old", "softwareupdater.new"] 
    2626 
    2727 
  • seattle/trunk/dist/win/scripts/manifest.txt

    r2748 r3322  
    1919 
    2020==start_seattle.bat== 
    21 Included in the Windows installer, this will start the python scripts 
    22 that comprise seattle when called. 
     21Included in the Windows installer, it starts the seattle programs which run in 
     22the background. 
    2323 
    2424==stop_seattle.bat== 
    25 Included in the Windows installer, this runs impose_seattlestopper_lock.py in the 
    26 background when called. 
     25Included in the Windows installer, this runs stop_all_seattle_processes.py which 
     26kills all seattle processes. 
    2727 
    2828==uninstall.bat== 
  • seattle/trunk/dist/win/scripts/start_seattle.bat

    r2816 r3322  
    66cd %TargetDir% 
    77 
    8 start /min /wait pythonw.exe get_seattlestopper_lock.py 
    98start /min pythonw.exe nmmain.py 
    109start /min pythonw.exe softwareupdater.py 
  • seattle/trunk/dist/win/scripts/start_seattle_shortcut.bat

    r2816 r3322  
    33if not exist "%PROG_PATH%" goto REMOVAL 
    44cd "%PROG_PATH%" 
    5 start_seattle.sh 
     5start_seattle.bat 
    66goto END 
    77:REMOVAL 
  • seattle/trunk/dist/win/scripts/stop_seattle.bat

    r2816 r3322  
    66cd %TargetDir% 
    77 
    8 start /min pythonw impose_seattlestopper_lock.py 
     8start pythonw stop_all_seattle_processes.py 
    99echo.seattle has been stopped. 
    1010 
  • seattle/trunk/dist/winmob/scripts/start_seattle.py

    r2547 r3322  
    3636    None. 
    3737  """ 
    38   windows_api.launch_python_script(prog_dir + "/get_seattlestopper_lock.py") 
    3938  windows_api.launch_python_script(prog_dir + "/nmmain.py") 
    4039  windows_api.launch_python_script(prog_dir + "/softwareupdater.py")