gnustep/libs-ec
0
0
Fork 0
mirror of https://github.com/gnustep/libs-ec.git synced 2025-02-19 10:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve alerting when running low on disk space

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@39858 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-06-11 15:23:40 +00:00
parent 20411c2fa3
commit 45e63db3de
1 changed files with 45 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
EcCommand.m
View file

@ -2770,6 +2770,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
static unsigned pingControlCount = 0;
NSFileManager *mgr;
NSDictionary *a;
NSString *s;
float f;
unsigned count;
BOOL lost = NO;
@ -2940,7 +2941,9 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
* space.
*/
mgr = [NSFileManager defaultManager];
a = [mgr fileSystemAttributesAtPath: cmdLogsDir(nil)];
s = [[self ecUserDirectory] stringByAppendingPathComponent: @"DebugLogs"];
a = [mgr fileSystemAttributesAtPath: s];
f = [[a objectForKey: NSFileSystemFreeSize] floatValue]
/ [[a objectForKey: NSFileSystemSize] floatValue];
if (f <= spaceFree)
@ -2956,13 +2959,13 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
if ([m length] == 0)
{
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
@"Disk space at %02.1f percent"), f * 100.0];
@"Debug disk debug space at %02.1f percent"), f * 100.0];
}
else
{
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
@"Disk space at %02.1f percent"
@" - deleted logs from %@ to make space"),
@"Debug disk space at %02.1f percent"
@" - deleted debug logs from %@ to make space"),
f * 100.0, m];
}
[self information: m from: nil to: nil type: LT_ALERT];
@ -2983,18 +2986,53 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
if ([m length] == 0)
{
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
@"Disk nodes at %02.1f percent"), f * 100.0];
@"Debug disk nodes at %02.1f percent"), f * 100.0];
}
else
{
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
@"Disk nodes at %02.1f percent"
@" - deleted logs from %@ to make space"),
@"Debug disk nodes at %02.1f percent"
@" - deleted debug logs from %@ to make space"),
f * 100.0, m];
}
[self information: m from: nil to: nil type: LT_ALERT];
}
}
s = [[self ecUserDirectory] stringByAppendingPathComponent: @"Logs"];
a = [mgr fileSystemAttributesAtPath: s];
f = [[a objectForKey: NSFileSystemFreeSize] floatValue]
/ [[a objectForKey: NSFileSystemSize] floatValue];
if (f <= spaceFree)
{
static NSDate *last = nil;
if (nil == last || [last timeIntervalSinceNow] < -DLY)
{
NSString *m;
ASSIGN(last, [NSDate date]);
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
@"Disk space at %02.1f percent"), f * 100.0];
[self information: m from: nil to: nil type: LT_ALERT];
}
}
f = [[a objectForKey: NSFileSystemFreeNodes] floatValue]
/ [[a objectForKey: NSFileSystemNodes] floatValue];
if (f <= nodesFree)
{
static NSDate *last = nil;
if (nil == last || [last timeIntervalSinceNow] < -DLY)
{
NSString *m;
ASSIGN(last, [NSDate date]);
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
@"Disk nodes at %02.1f percent"), f * 100.0];
[self information: m from: nil to: nil type: LT_ALERT];
}
}
}
inTimeout = NO;
}