Changeset 1f1481c9


Ignore:
Timestamp:
02/28/14 11:30:09 (8 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
0130b27
Parents:
28f8495
Message:

Fix a bug in the LP tray "messages" dialog use that was wiping out the non-error messages.

Location:
src-qt4/life-preserver/lp-tray
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/life-preserver/lp-tray/LPTray.cpp

    rcbe0295 r1f1481c9  
    184184    if(info.isEmpty()){continue;} 
    185185    //Take into account multiple devices/messages per type 
    186     QStringList devs=info[2].split(":::"); QStringList msgs=info[3].split(":::"); 
     186    QStringList devs=info[2].split(":::"); QStringList msg=info[3].split(":::"); 
    187187    for(int j=0; j<devs.length(); j++){ 
    188188      if(info[0] == "ERROR"){ 
    189         errs << info[1] + " (" + devs[j] + "): " + msgs[j]; 
     189        errs << info[1] + " (" + devs[j] + "): " + msg[j]; 
    190190      }else if(!info[0].isEmpty()){ 
    191         msgs << info[1] + " (" + devs[j] + "): " + msgs[j]; 
     191        msgs << info[1] + " (" + devs[j] + "): " + msg[j]; 
    192192      } 
    193193    } 
  • src-qt4/life-preserver/lp-tray/LPWatcher.cpp

    r9537cb2 r1f1481c9  
    8282  QStringList output; 
    8383  type = type.toLower(); 
    84   //Valid types - "critical"/"running"/"message" 
     84  //Valid types - "critical"/"running"/"message"/"replication"/"mirror"/"resilver"/"scrub" 
    8585  //Valid messages - "dataset","message","summary","id", "timestamp", "time" 
    8686  unsigned int base; 
Note: See TracChangeset for help on using the changeset viewer.