Changeset 18 for trunk


Ignore:
Timestamp:
Mar 21, 2016, 1:23:44 PM (9 years ago)
Author:
gegorbet
Message:

gridctl mods for Airavata 0.16 interface

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/cleanup.php

    r17 r18  
    413413         file_put_contents( "$output_dir/$fn", $xml );    // Copy to submit dir
    414414
     415         $file_type = "jobstats";
    415416      }
    416417

  • trunk/cleanup_adev.php

    r10 r18  
    88 */
    99
    10 $us3bin = exec( "ls -d ~us3/bin" );
     10$us3bin = exec( "ls -d ~us3/lims/bin" );
    1111include_once "$us3bin/listen-config.php";
    1212include $class_dir_d . "experiment_status.php";

  • trunk/cleanup_aira.php

    r10 r18  
    88 */
    99
    10 $us3bin = exec( "ls -d ~us3/bin" );
     10$us3bin = exec( "ls -d ~us3/lims/bin" );
    1111include_once "$us3bin/listen-config.php";
    1212include $class_dir_p . "experiment_status.php";

  • trunk/cleanup_gfac.php

    r7 r18  
    77 */
    88
    9 $us3bin = exec( "ls -d ~us3/bin" );
     9$us3bin = exec( "ls -d ~us3/lims/bin" );
    1010include_once "$us3bin/listen-config.php";
    1111$me              = 'cleanup_gfac.php';

  • trunk/cluster_status.php

    r17 r18  
    165165   global $data;
    166166
    167 //   $clusters = array( "alamo", "lonestar", "lonestar5", "stampede",
    168 //                      "comet", "gordon" );
    169    $clusters = array( "alamo", "lonestar", "lonestar5", "stampede",
     167   $clusters = array( "alamo", "lonestar5", "stampede",
    170168                      "comet", "gordon", "jureca", "jacinto" );
    171169   foreach ( $clusters as $clname )

  • trunk/gridctl.php

    r17 r18  
    88
    99//global $self;
     10global $status_ex, $status_gw;
    1011
    1112// Produce some output temporarily, so cron will send me message
    … …  
    679680   global $loghdr;
    680681   global $cluster;
     682   global $status_ex, $status_gw;
    681683
    682684   if ( is_aira_job( $gfacID ) )
    … …  
    686688      if ( $status_ex == 'EXECUTING' )
    687689      {
    688          if ( $gfac_status == 'SUBMITTED' )
     690         if ( $status_gw == 'SUBMITTED' )
    689691            $status_ex    = 'QUEUED';
    690          if ( $gfac_status == 'RUNNING' )
     692         if ( $status_gw == 'RUNNING' )
    691693            $status_ex    = 'ACTIVE';
    692694      }

  • trunk/gridctl_dev.php

    r10 r18  
    11<?php
    22
    3 $us3bin    = exec( "ls -d ~us3/bin" );
     3$us3bin    = exec( "ls -d ~us3/lims/bin" );
    44include_once "$us3bin/listen-config.php";
    55

  • trunk/gridctl_pro.php

    r10 r18  
    11<?php
    22
    3 $us3bin    = exec( "ls -d ~us3/bin" );
     3$us3bin    = exec( "ls -d ~us3/lims/bin" );
    44include_once "$us3bin/listen-config.php";
    55

  • trunk/listen.php

    r9 r18  
    11<?php
    22
    3 $us3bin = exec( "ls -d ~us3/bin" );
     3$us3bin = exec( "ls -d ~us3/lims/bin" );
    44include "$us3bin/listen-config.php";
    55
    … …  
    1818$php = "/usr/bin/php";
    1919
    20 $cmd = "/usr/bin/nohup $php $home/bin/manage-us3-pipe.php >>$home/etc/manage.log 2>&1 </dev/null &";
     20$cmd = "/usr/bin/nohup $php $home/lims/bin/manage-us3-pipe.php >>$home/lims/etc/manage.log 2>&1 </dev/null &";
    2121
    2222exec( $cmd );

  • trunk/manage-us3-pipe.php

    r10 r18  
    11<?php
    22
    3 $us3bin = exec( "ls -d ~us3/bin" );
     3$us3bin = exec( "ls -d ~us3/lims/bin" );
    44include "$us3bin/listen-config.php";
    55include "/srv/www/htdocs/common/class/experiment_status.php";

  • trunk/update_notice.php

    r7 r18  
    11<?php
    22
    3 $us3bin = exec( "ls -d ~us3/bin" );
    4 $us3etc = exec( "ls -d ~us3/etc" );
     3$us3bin = exec( "ls -d ~us3/lims/bin" );
     4$us3etc = exec( "ls -d ~us3/lims/etc" );
    55include_once "$us3bin/listen-config.php";
    66
    … …  
    122122{
    123123   $key    = $type . $rev;
    124    $msgf   = $notices[ $key ][ 'msg'  ];
    125124
    126125   if ( in_array( $key, $keys ) )
    127126   {  // Entry is in both file and DB
     127      $msgf   = $notices[ $key ][ 'msg'  ];
    128128      $notices[ $key ][ 'id'   ] = $id;
    129129      $notices[ $key ][ 'type' ] = $type;

  • trunk/us3-notice.php

    r7 r18  
    1 $us3bin = exec( "ls -d ~us3/bin" );
     1$us3bin = exec( "ls -d ~us3/lims/bin" );
    22include_once "$us3bin/listen-config.php";
    33include "$us3bin/cleanup_aira.php";
Note: See TracChangeset for help on using the changeset viewer.