Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Justin
slapos.toolbox
Commits
cdd82184
Commit
cdd82184
authored
Sep 28, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't mix spaces and tabs
parent
a15490b4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
39 deletions
+39
-39
slapos/runner/utils.py
slapos/runner/utils.py
+39
-39
No files found.
slapos/runner/utils.py
View file @
cdd82184
...
@@ -276,18 +276,18 @@ def runSoftwareWithLock(config):
...
@@ -276,18 +276,18 @@ def runSoftwareWithLock(config):
for
path
in
os
.
listdir
(
config
[
'software_root'
]):
for
path
in
os
.
listdir
(
config
[
'software_root'
]):
exist
=
False
exist
=
False
for
val
in
data
:
for
val
in
data
:
if
val
[
'md5'
]
==
path
:
if
val
[
'md5'
]
==
path
:
exist
=
True
exist
=
True
conf
=
os
.
path
.
join
(
config
[
'etc_dir'
],
".project"
)
conf
=
os
.
path
.
join
(
config
[
'etc_dir'
],
".project"
)
if
not
exist
:
#save this compile software folder
if
not
exist
:
#save this compile software folder
if
os
.
path
.
exists
(
conf
):
if
os
.
path
.
exists
(
conf
):
data
.
append
({
"title"
:
getProjectTitle
(
config
),
"md5"
:
path
,
data
.
append
({
"title"
:
getProjectTitle
(
config
),
"md5"
:
path
,
"path"
:
open
(
os
.
path
.
join
(
config
[
'etc_dir'
],
"path"
:
open
(
os
.
path
.
join
(
config
[
'etc_dir'
],
".project"
),
'r'
).
read
()})
".project"
),
'r'
).
read
()})
writeSoftwareData
(
config
[
'etc_dir'
],
data
)
writeSoftwareData
(
config
[
'etc_dir'
],
data
)
else
:
else
:
shutil
.
rmtree
(
os
.
path
.
join
(
config
[
'software_root'
],
path
))
shutil
.
rmtree
(
os
.
path
.
join
(
config
[
'software_root'
],
path
))
break
break
return
True
return
True
return
False
return
False
...
@@ -328,7 +328,7 @@ def recursifKill(pids):
...
@@ -328,7 +328,7 @@ def recursifKill(pids):
try
:
try
:
os
.
kill
(
pid
,
signal
.
SIGKILL
)
#kill current process
os
.
kill
(
pid
,
signal
.
SIGKILL
)
#kill current process
except
Exception
:
except
Exception
:
pass
pass
recursifKill
(
ppids
)
#kill all children of this process
recursifKill
(
ppids
)
#kill all children of this process
def
pidppid
(
pid
):
def
pidppid
(
pid
):
...
@@ -404,10 +404,10 @@ def removeInstanceRoot(config):
...
@@ -404,10 +404,10 @@ def removeInstanceRoot(config):
svcStopAll
(
config
)
svcStopAll
(
config
)
for
root
,
dirs
,
files
in
os
.
walk
(
config
[
'instance_root'
]):
for
root
,
dirs
,
files
in
os
.
walk
(
config
[
'instance_root'
]):
for
fname
in
dirs
:
for
fname
in
dirs
:
fullPath
=
os
.
path
.
join
(
root
,
fname
)
fullPath
=
os
.
path
.
join
(
root
,
fname
)
if
not
os
.
access
(
fullPath
,
os
.
W_OK
)
:
if
not
os
.
access
(
fullPath
,
os
.
W_OK
)
:
# Some directories may be read-only, preventing to remove files in it
# Some directories may be read-only, preventing to remove files in it
os
.
chmod
(
fullPath
,
0744
)
os
.
chmod
(
fullPath
,
0744
)
shutil
.
rmtree
(
config
[
'instance_root'
])
shutil
.
rmtree
(
config
[
'instance_root'
])
def
getSvcStatus
(
config
):
def
getSvcStatus
(
config
):
...
@@ -472,13 +472,13 @@ def getFolderContent(config, folder):
...
@@ -472,13 +472,13 @@ def getFolderContent(config, folder):
ldir = sorted(os.listdir(realdir), key=str.lower)
ldir = sorted(os.listdir(realdir), key=str.lower)
for f in ldir:
for f in ldir:
if f.startswith('
.
'): #do not displays this file/folder
if f.startswith('
.
'): #do not displays this file/folder
continue
continue
ff=os.path.join(d,f)
ff=os.path.join(d,f)
if os.path.isdir(os.path.join(realdir,f)):
if os.path.isdir(os.path.join(realdir,f)):
r.append('
<
li
class
=
"directory collapsed"
><
a
href
=
"#%s"
rel
=
"%s/"
>%
s
</
a
></
li
>
' % (ff, ff,f))
r.append('
<
li
class
=
"directory collapsed"
><
a
href
=
"#%s"
rel
=
"%s/"
>%
s
</
a
></
li
>
' % (ff, ff,f))
else:
else:
e=os.path.splitext(f)[1][1:] # get .ext and remove dot
e=os.path.splitext(f)[1][1:] # get .ext and remove dot
r.append('
<
li
class
=
"file ext_%s"
><
a
href
=
"#%s"
rel
=
"%s"
>%
s
</
a
></
li
>
' % (e, ff,ff,f))
r.append('
<
li
class
=
"file ext_%s"
><
a
href
=
"#%s"
rel
=
"%s"
>%
s
</
a
></
li
>
' % (e, ff,ff,f))
r.append('
</
ul
>
')
r.append('
</
ul
>
')
except Exception,e:
except Exception,e:
r.append('
Could
not
load
directory
:
%
s
' % str(e))
r.append('
Could
not
load
directory
:
%
s
' % str(e))
...
@@ -509,10 +509,10 @@ def getFolder(config, folder):
...
@@ -509,10 +509,10 @@ def getFolder(config, folder):
ldir = sorted(os.listdir(realdir), key=str.lower)
ldir = sorted(os.listdir(realdir), key=str.lower)
for f in ldir:
for f in ldir:
if f.startswith('
.
'): #do not display this file/folder
if f.startswith('
.
'): #do not display this file/folder
continue
continue
ff=os.path.join(d,f)
ff=os.path.join(d,f)
if os.path.isdir(os.path.join(realdir,f)):
if os.path.isdir(os.path.join(realdir,f)):
r.append('
<
li
class
=
"directory collapsed"
><
a
href
=
"#%s"
rel
=
"%s/"
>%
s
</
a
></
li
>
' % (ff, ff, f))
r.append('
<
li
class
=
"directory collapsed"
><
a
href
=
"#%s"
rel
=
"%s/"
>%
s
</
a
></
li
>
' % (ff, ff, f))
r.append('
</
ul
>
')
r.append('
</
ul
>
')
except Exception,e:
except Exception,e:
r.append('
Could
not
load
directory
:
%
s
' % str(e))
r.append('
Could
not
load
directory
:
%
s
' % str(e))
...
@@ -579,10 +579,10 @@ def newSoftware(folder, config, session):
...
@@ -579,10 +579,10 @@ def newSoftware(folder, config, session):
software = "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/lamp-template/software.cfg"
software = "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/lamp-template/software.cfg"
softwareContent = ""
softwareContent = ""
try:
try:
softwareContent = urllib.urlopen(software).read()
softwareContent = urllib.urlopen(software).read()
except:
except:
#Software.cfg and instance.cfg content will be empty
#Software.cfg and instance.cfg content will be empty
pass
pass
open(os.path.join(folderPath, config['
software_profile
']), '
w
').write(softwareContent)
open(os.path.join(folderPath, config['
software_profile
']), '
w
').write(softwareContent)
open(os.path.join(folderPath, config['
instance_profile
']), '
w
').write("")
open(os.path.join(folderPath, config['
instance_profile
']), '
w
').write("")
open(os.path.join(basedir, ".project"), '
w
').write(folder + "/")
open(os.path.join(basedir, ".project"), '
w
').write(folder + "/")
...
@@ -688,15 +688,15 @@ def tail(f, lines=20):
...
@@ -688,15 +688,15 @@ def tail(f, lines=20):
data = []
data = []
while size > 0 and bytes > 0:
while size > 0 and bytes > 0:
if bytes - BUFSIZ > 0:
if bytes - BUFSIZ > 0:
# Seek back one whole BUFSIZ
# Seek back one whole BUFSIZ
f.seek(block * BUFSIZ, 2)
f.seek(block * BUFSIZ, 2)
# read BUFFER
# read BUFFER
data.insert(0, f.read(BUFSIZ))
data.insert(0, f.read(BUFSIZ))
else:
else:
# file too small, start from begining
# file too small, start from begining
f.seek(0,0)
f.seek(0,0)
# only read what was not read
# only read what was not read
data.insert(0, f.read(bytes))
data.insert(0, f.read(bytes))
linesFound = data[0].count('
\
n
')
linesFound = data[0].count('
\
n
')
size -= linesFound
size -= linesFound
bytes -= BUFSIZ
bytes -= BUFSIZ
...
@@ -725,10 +725,10 @@ def readFileFrom(f, lastPosition):
...
@@ -725,10 +725,10 @@ def readFileFrom(f, lastPosition):
else:
else:
margin = abs(block*BUFSIZ) - size
margin = abs(block*BUFSIZ) - size
if length < BUFSIZ:
if length < BUFSIZ:
f.seek(0,0)
f.seek(0,0)
else:
else:
seek = block * BUFSIZ + margin
seek = block * BUFSIZ + margin
f.seek(seek, 2)
f.seek(seek, 2)
data = f.read(BUFSIZ - margin) + data
data = f.read(BUFSIZ - margin) + data
bytes -= BUFSIZ
bytes -= BUFSIZ
block -= 1
block -= 1
...
@@ -756,7 +756,7 @@ def md5sum(file):
...
@@ -756,7 +756,7 @@ def md5sum(file):
while True:
while True:
data = fh.read(8192)
data = fh.read(8192)
if not data:
if not data:
break
break
m.update(data)
m.update(data)
return m.hexdigest()
return m.hexdigest()
except:
except:
...
@@ -774,9 +774,9 @@ def realpath(config, path, check_exist=True):
...
@@ -774,9 +774,9 @@ def realpath(config, path, check_exist=True):
path = os.path.join(allow_list[key], string.join(split_path, '
/
'))
path = os.path.join(allow_list[key], string.join(split_path, '
/
'))
if check_exist:
if check_exist:
if os.path.exists(path):
if os.path.exists(path):
return path
return path
else:
else:
return False
return False
else:
else:
return path
return path
return False
return False
...
@@ -798,7 +798,7 @@ def readParameters(path):
...
@@ -798,7 +798,7 @@ def readParameters(path):
for subnode in elt.childNodes:
for subnode in elt.childNodes:
if subnode.nodeType != subnode.TEXT_NODE:
if subnode.nodeType != subnode.TEXT_NODE:
sub_object[str(subnode.getAttribute('
id
'))] = subnode.childNodes[0].data #.decode('
utf
-
8
').decode('
utf
-
8
')
sub_object[str(subnode.getAttribute('
id
'))] = subnode.childNodes[0].data #.decode('
utf
-
8
').decode('
utf
-
8
')
object[str(elt.tagName)] = sub_object
object[str(elt.tagName)] = sub_object
return object
return object
except Exception, e:
except Exception, e:
return str(e)
return str(e)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment