Commit f21594ce authored by Mila Green's avatar Mila Green Committed by Chromium LUCI CQ

Updater: Remove hash suffix from updater launchd service entries.

Here is the new state:
$ launchctl list | grep GoogleUpdater
-	0	com.google.GoogleUpdater.update
-	0	com.google.GoogleUpdater.wake.89.0.4357.0
-	0	com.google.GoogleUpdater.update-internal.89.0.4357.0

$ launchctl list com.google.GoogleUpdater.update
{
	"LimitLoadToSessionType" = "Aqua";
	"MachServices" = {
		"com.google.GoogleUpdater.update.mach" = mach-port-object;
	};
	"Label" = "com.google.GoogleUpdater.update";
	"OnDemand" = true;
	"LastExitStatus" = 0;
	"Program" = "/Users/milagreen/Library/Google/GoogleUpdater/89.0.4357.0/GoogleUpdater.app/Contents/MacOS/GoogleUpdater";
	"ProgramArguments" = (
		"/Users/milagreen/Library/Google/GoogleUpdater/89.0.4357.0/GoogleUpdater.app/Contents/MacOS/GoogleUpdater";
		"--server";
		"--service=update";
		"--enable-logging";
		"--vmodule=*/updater/*=2";
	);
};

$ launchctl list com.google.GoogleUpdater.update-internal.89.0.4357.0
{
	"LimitLoadToSessionType" = "Aqua";
	"MachServices" = {
		"com.google.GoogleUpdater.update-internal.89.0.4357.0.mach" = mach-port-object;
	};
	"Label" = "com.google.GoogleUpdater.update-internal.89.0.4357.0";
	"OnDemand" = true;
	"LastExitStatus" = 0;
	"Program" = "/Users/milagreen/Library/Google/GoogleUpdater/89.0.4357.0/GoogleUpdater.app/Contents/MacOS/GoogleUpdater";
	"ProgramArguments" = (
		"/Users/milagreen/Library/Google/GoogleUpdater/89.0.4357.0/GoogleUpdater.app/Contents/MacOS/GoogleUpdater";
		"--server";
		"--service=update-internal";
		"--enable-logging";
		"--vmodule=*/updater/*=2";
	);
};


Bug: 1143718
Change-Id: I66289cebf8d35acc63cbbc9c5e3d46d7da283df1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2594118Reviewed-by: default avatarSorin Jianu <sorin@chromium.org>
Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Commit-Queue: Mila Green <milagreen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837656}
parent 1ca0e21a
...@@ -47,8 +47,7 @@ base::scoped_nsobject<NSString> GetUpdateServiceInternalLaunchdLabel() { ...@@ -47,8 +47,7 @@ base::scoped_nsobject<NSString> GetUpdateServiceInternalLaunchdLabel() {
base::scoped_nsobject<NSString> GetUpdateServiceMachName( base::scoped_nsobject<NSString> GetUpdateServiceMachName(
base::scoped_nsobject<NSString> name) { base::scoped_nsobject<NSString> name) {
return base::scoped_nsobject<NSString>( return base::scoped_nsobject<NSString>(
[name stringByAppendingFormat:@".%lu", [name hash]], [name stringByAppendingString:@".mach"], base::scoped_policy::RETAIN);
base::scoped_policy::RETAIN);
} }
base::scoped_nsobject<NSString> GetUpdateServiceMachName() { base::scoped_nsobject<NSString> GetUpdateServiceMachName() {
...@@ -56,17 +55,7 @@ base::scoped_nsobject<NSString> GetUpdateServiceMachName() { ...@@ -56,17 +55,7 @@ base::scoped_nsobject<NSString> GetUpdateServiceMachName() {
} }
base::scoped_nsobject<NSString> GetUpdateServiceInternalMachName() { base::scoped_nsobject<NSString> GetUpdateServiceInternalMachName() {
base::scoped_nsobject<NSString> serviceLaunchdLabel( return GetUpdateServiceMachName(GetUpdateServiceInternalLaunchdLabel());
GetUpdateServiceLaunchdLabel(), base::scoped_policy::RETAIN);
base::scoped_nsobject<NSString> updaterVersionString(
base::SysUTF8ToNSString(UPDATER_VERSION_STRING),
base::scoped_policy::RETAIN);
base::scoped_nsobject<NSString> name(
[NSString stringWithFormat:@"%@.%@", serviceLaunchdLabel.get(),
updaterVersionString.get()],
base::scoped_policy::RETAIN);
return GetUpdateServiceMachName(name);
} }
} // namespace updater } // namespace updater
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment