Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zimbra
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
zimbra
Commits
e1c0fae5
Commit
e1c0fae5
authored
Mar 27, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use explicit m// operator to allow later string replace
parent
39986b3f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
ZimbraBuild/rpmconf/Upgrade/zmupgrade.pm
ZimbraBuild/rpmconf/Upgrade/zmupgrade.pm
+2
-2
ZimbraServer/src/libexec/zmcheckduplicatemysqld
ZimbraServer/src/libexec/zmcheckduplicatemysqld
+1
-1
ZimbraServer/src/libexec/zmstat-allprocs
ZimbraServer/src/libexec/zmstat-allprocs
+2
-2
No files found.
ZimbraBuild/rpmconf/Upgrade/zmupgrade.pm
View file @
e1c0fae5
...
@@ -5204,7 +5204,7 @@ sub upgradeLdap($) {
...
@@ -5204,7 +5204,7 @@ sub upgradeLdap($) {
print OUT "olcDatabase: {3}mdb
\n
";
print OUT "olcDatabase: {3}mdb
\n
";
next;
next;
}
}
if (
$_
=~
/^olcDbDirectory:
\
/opt
\
/zimbra
\
/data
\
/ldap
\
/hdb
\
/db/
) {
if (
$_
=~
m|^olcDbDirectory: /opt/zimbra/data/ldap/hdb/db|
) {
print OUT "olcDbDirectory: /opt/zimbra/data/ldap/mdb/db
\n
";
print OUT "olcDbDirectory: /opt/zimbra/data/ldap/mdb/db
\n
";
next;
next;
}
}
...
@@ -5276,7 +5276,7 @@ sub upgradeLdap($) {
...
@@ -5276,7 +5276,7 @@ sub upgradeLdap($) {
print OUT "olcDatabase: {2}mdb
\n
";
print OUT "olcDatabase: {2}mdb
\n
";
next;
next;
}
}
if (
$_
=~
/^olcDbDirectory:
\
/opt
\
/zimbra
\
/data
\
/ldap
\
/hdb
\
/db/
) {
if (
$_
=~
m|^olcDbDirectory: /opt/zimbra/data/ldap/hdb/db|
) {
print OUT "olcDbDirectory: /opt/zimbra/data/ldap/mdb/db
\n
";
print OUT "olcDbDirectory: /opt/zimbra/data/ldap/mdb/db
\n
";
next;
next;
}
}
...
...
ZimbraServer/src/libexec/zmcheckduplicatemysqld
View file @
e1c0fae5
...
@@ -42,7 +42,7 @@ my $localxml = XMLin("/opt/zimbra/conf/localconfig.xml");
...
@@ -42,7 +42,7 @@ my $localxml = XMLin("/opt/zimbra/conf/localconfig.xml");
my
$table
=
new
Proc::
ProcessTable
;
my
$table
=
new
Proc::
ProcessTable
;
foreach
my
$p
(
@
{
$table
->
table
}
)
{
foreach
my
$p
(
@
{
$table
->
table
}
)
{
my
(
$pid
,
$ppid
,
$pgrp
,
$cmdline
)
=
(
$p
->
pid
,
$p
->
ppid
,
$p
->
pgrp
,
$p
->
cmndline
);
my
(
$pid
,
$ppid
,
$pgrp
,
$cmdline
)
=
(
$p
->
pid
,
$p
->
ppid
,
$p
->
pgrp
,
$p
->
cmndline
);
if
(
$p
->
fname
eq
"
mysqld
"
&&
$cmdline
=~
/\/opt\/zimbra\/db/
)
{
if
(
$p
->
fname
eq
"
mysqld
"
&&
$cmdline
=~
m|/opt/zimbra/db|
)
{
#if ($p->fname eq "mysqld") {
#if ($p->fname eq "mysqld") {
addToReport
("
PID:
$pid
PPID:
$ppid
PGRP:
$pgrp
\n
CMD:
\t
$cmdline
\n\n
")
addToReport
("
PID:
$pid
PPID:
$ppid
PGRP:
$pgrp
\n
CMD:
\t
$cmdline
\n\n
")
if
(
$p
->
fname
eq
"
mysqld
"
&&
$debug
);
if
(
$p
->
fname
eq
"
mysqld
"
&&
$debug
);
...
...
ZimbraServer/src/libexec/zmstat-allprocs
View file @
e1c0fae5
...
@@ -66,8 +66,8 @@ sub get_pid_tree() {
...
@@ -66,8 +66,8 @@ sub get_pid_tree() {
if
(
open
(
CMDLINE
,
"
<
$PROCFS
/
$pid
/cmdline
"))
{
# else pid has gone away
if
(
open
(
CMDLINE
,
"
<
$PROCFS
/
$pid
/cmdline
"))
{
# else pid has gone away
while
(
my
$line
=
<
CMDLINE
>
)
{
while
(
my
$line
=
<
CMDLINE
>
)
{
my
@args
=
split
('
\
0
',
$line
);
my
@args
=
split
('
\
0
',
$line
);
$cmd
=
'
zmconfigd
'
if
(
$args
[
$#args
]
=~
/\/opt\/zimbra\/libexec\/zmconfigd/
);
$cmd
=
'
zmconfigd
'
if
(
$args
[
$#args
]
=~
m|//opt/zimbra/libexec/zmconfigd|
);
$cmd
=
'
zmmailboxd
'
if
(
$args
[
$#args
]
=~
/\/opt\/zimbra\/mailboxd\/etc\/jetty.xml/
);
$cmd
=
'
zmmailboxd
'
if
(
$args
[
$#args
]
=~
m|/opt/zimbra/mailboxd/etc/jetty.xml|
);
}
}
}
}
}
}
...
...
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